Merge pull request #756 from MetaCell/feature/CH-140

Library updates and small fixes
MetaCell · Jul 30, 2024 · f403e8c · f403e8c
2 parents e0ba439 + 993b04a
commit f403e8c
Show file tree

Hide file tree

Showing 122 changed files with 3,753 additions and 10,656 deletions.
diff --git a/README.md b/README.md
@@ -75,7 +75,7 @@ Python 3.9 must be installed.
 It is recommended to setup a virtual environment.
 With conda: 
 ```bash
-conda create --name ch python=3.9
+conda create --name ch python=3.12
 conda activate ch
 ```
 

diff --git a/application-templates/base/test/e2e/landing.spec.ts b/application-templates/base/test/e2e/landing.spec.ts
@@ -29,7 +29,7 @@ describe("End to end test", () => {
       return el.textContent;
     });
 
-    expect(await page.title()).toEqual("Samples");
-    expect(title).toEqual("Sample React application is working!");
+    expect(await page.title()).not.toBeNull();
+    expect(title).not.toBeNull();
   });
 });
diff --git a/application-templates/webapp/frontend/.babelrc b/application-templates/webapp/frontend/.babelrc
diff --git a/application-templates/webapp/frontend/.dockerignore b/application-templates/webapp/frontend/.dockerignore
diff --git a/application-templates/webapp/frontend/.eslintignore b/application-templates/webapp/frontend/.eslintignore
diff --git a/application-templates/webapp/frontend/.eslintrc.cjs b/application-templates/webapp/frontend/.eslintrc.cjs
@@ -0,0 +1,19 @@
+module.exports = {
+  root: true,
+  env: { browser: true, es2020: true },
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  ignorePatterns: ['dist', '.eslintrc.cjs', 'src/rest/*'],
+  parser: '@typescript-eslint/parser',
+  plugins: ['react-refresh'],
+  rules: {
+    'react-refresh/only-export-components': [
+      'warn',
+      { allowConstantExport: true },
+    ],
+    '@typescript-eslint/no-explicit-any': 'off',
+  }
+}
diff --git a/application-templates/webapp/frontend/.eslintrc.yml b/application-templates/webapp/frontend/.eslintrc.yml
diff --git a/application-templates/webapp/frontend/.gitignore b/application-templates/webapp/frontend/.gitignore
diff --git a/application-templates/webapp/frontend/README.md b/application-templates/webapp/frontend/README.md
diff --git a/application-templates/webapp/frontend/build.yaml b/application-templates/webapp/frontend/build.yaml
diff --git a/application-templates/webapp/frontend/index.html b/application-templates/webapp/frontend/index.html
@@ -0,0 +1,16 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8" />
+  <link rel="icon" type="image/svg+xml" href="/favicon.png" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>CloudHarness sample application</title>
+</head>
+
+<body>
+  <div id="root"></div>
+  <script type="module" src="/src/main.tsx"></script>
+</body>
+
+</html>
diff --git a/application-templates/webapp/frontend/package.json b/application-templates/webapp/frontend/package.json
diff --git a/application-templates/webapp/frontend/public/favicon.png b/application-templates/webapp/frontend/public/favicon.png
diff --git a/...lates/webapp/frontend/src/assets/icon.png → ...templates/webapp/frontend/public/logo.png b/...lates/webapp/frontend/src/assets/icon.png → ...templates/webapp/frontend/public/logo.png
diff --git a/application-templates/webapp/frontend/src/App.tsx b/application-templates/webapp/frontend/src/App.tsx
@@ -1,16 +1,16 @@
-import React from 'react';
-import './styles/style.less';
-
 import RestTest from './components/RestTest';
+import Version from './components/Version';
 
 
 const Main = () => (
     <>
-      <img src="/assets/icon.png" />
-      <h1>Sample React application is working!</h1>
+      <img src="/logo.png" width="800" />
+      <h1>__APP_NAME__ React application is working!</h1>
+      <Version />
       <RestTest />
-      <p>See api documentation <a href="/api/ui">here</a></p>
+      <p>See api documentation <a href="/api/ui/">here</a></p>
     </>
-);
+  )
+
 
-export default Main;
+export default Main;
diff --git a/application-templates/webapp/frontend/src/components/RestTest.tsx b/application-templates/webapp/frontend/src/components/RestTest.tsx
@@ -1,17 +1,19 @@
-import React, { useState, useEffect } from 'react';
+import { useState, useEffect } from 'react';
 
 
-import { TestApi } from '../rest/api'
+import { TestApi } from '../rest/apis/TestApi'
 const test = new TestApi();
 
+
+
 const RestTest = () => {
-  const [result, setResult] = useState(null);
+  const [result, setResult] = useState<any>(null);
   useEffect(() => {
-    test.ping().then(r => setResult(r), () => setResult({ data: "API error"}));
+    test.ping().then((r) => setResult(r), () => setResult( "API error"));
   }, []);
 
 
-  return result ? <p>Backend answered: { result.data } </p> : <p>Backend did not answer</p>
+  return result ? <p>Backend answered: { result } </p> : <p>Backend did not answer</p>
 }
 
 export default RestTest;
diff --git a/application-templates/webapp/frontend/src/components/Version.tsx b/application-templates/webapp/frontend/src/components/Version.tsx
@@ -0,0 +1,19 @@
+import { useState, useEffect } from 'react';
+
+
+
+const Version = () => {
+  const [result, setResult] = useState<any>(null);
+  useEffect(() => {
+    fetch("/proxy/common/api/version", {
+      headers: {
+        'Accept': 'application/json'
+      }
+    }).then(r => r.json().then(j => setResult(j)), () => setResult("API error"));
+  }, []);
+
+
+  return result ? <p>Tag: { result?.tag } - Build: {result?.build} </p> : <p>Backend did not answer</p>
+}
+
+export default Version;
diff --git a/application-templates/webapp/frontend/src/index.css b/application-templates/webapp/frontend/src/index.css
@@ -0,0 +1,5 @@
+body {
+  text-align: center;
+  background-color: '#eeeeee';
+  font-family: Roboto, Helvetica, sans-serif;
+}
diff --git a/application-templates/webapp/frontend/src/index.ejs b/application-templates/webapp/frontend/src/index.ejs
diff --git a/application-templates/webapp/frontend/src/index.tsx b/application-templates/webapp/frontend/src/index.tsx
diff --git a/application-templates/webapp/frontend/src/styles/style.less b/application-templates/webapp/frontend/src/styles/style.less
diff --git a/application-templates/webapp/frontend/src/utils/history.js b/application-templates/webapp/frontend/src/utils/history.js
diff --git a/application-templates/webapp/frontend/tsconfig.json b/application-templates/webapp/frontend/tsconfig.json
diff --git a/application-templates/webapp/frontend/vite.config.ts b/application-templates/webapp/frontend/vite.config.ts
@@ -0,0 +1,42 @@
+import { defineConfig, loadEnv } from 'vite'
+import react from '@vitejs/plugin-react'
+
+
+
+// https://vitejs.dev/config/
+export default defineConfig(({ mode }) => {
+  // Load env file based on `mode` in the current working directory.
+  // Set the third parameter to '' to load all env regardless of the `VITE_` prefix.
+  const env = loadEnv(mode, process.cwd(), '')
+
+  const theDomain = env && env.DOMAIN ? env.DOMAIN : 'localhost:5000';
+
+  console.log('Dev server address: ', theDomain);
+
+  const proxyTarget = theDomain;
+  const replaceHost = (uri: string, appName: string) => {
+    const host = (uri.includes("samples.") && uri.replace("samples.", appName + '.')) || uri;
+    console.log('Proxy target: ', host);
+    return host;
+  }
+
+
+  return {
+  plugins: [react()],
+  server: {
+    port: 9000,
+    proxy: {
+      '/api/': {
+        target: replaceHost( proxyTarget, 'samples'),
+        secure: false,
+        changeOrigin: true,
+      },
+      '/proxy/common/api': {
+        target: replaceHost( proxyTarget, 'common'),
+        secure: false,
+        changeOrigin: true,
+        rewrite: (path) => path.replace(/^\/proxy\/common\/api/, '/api')
+      }
+  }
+}}}
+)