Merge branch 'develop' into feature/CH-95

MetaCell · Jul 30, 2024 · d3782ff · d3782ff
2 parents ee064c9 + 25098cc
commit d3782ff
Show file tree

Hide file tree

Showing 243 changed files with 5,661 additions and 12,513 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,24 +1,29 @@
-Closes #
+Closes [CH-X](https://metacell.atlassian.net/browse/CH-X)
 
-Implemented solution: ... 
+# Implemented solution
 
-How to test this PR: ...
+... 
 
-### Sanity checks:
+# How to test this PR
+
+...
+
+# Sanity checks:
 - [ ] The pull request is explicitly linked to the relevant issue(s)
 - [ ] The issue is well described: clearly states the problem and the general proposed solution(s)
-- [ ] From the issue and the current PR it is explicitly stated how to test the current change
+- [ ] In this PR it is explicitly stated how to test the current change
 - [ ] The labels in the issue set the scope and the type of issue (bug, feature, etc.)
+- [ ] The relevant components are indicated in the issue (if any)
 - [ ] All the automated test checks are passing
-- [ ] All the linked issues are included in one milestone
-- [ ] All the linked issues are in the Review/QA column of the [board](https://app.zenhub.com/workspaces/cloud-harness-5fdb203b7e195b0015a273d7/board)
+- [ ] All the linked issues are included in one Sprint
+- [ ] All the linked issues are in the Review state
 - [ ] All the linked issues are assigned
 
-### Breaking changes (select one):
+# Breaking changes (select one):
 - [ ] The present changes do not change the preexisting api in any way
-- [ ] This PR and the issue are tagged as a `breaking-change`
+- [ ] This PR and the issue are tagged as a `breaking-change` and the migration procedure is well described [above](#implemented-solution)
 
-### Possible deployment updates issues (select one):
+# Possible deployment updates issues (select one):
 - [ ] There is no reason why deployments based on CloudHarness may break after the current update
 - [ ] This PR and the issue are tagged as `alert:deployment`
 

diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ __pycache__
 .env
 tools/deployment-cli-tools/tests/resources/migration
 tools/deployment-cli-tools/tests/resources/migration.bak
+/.venv
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
 ```
 
@@ -108,7 +108,6 @@ A JRE is needed to run the code generators based on openapi-generator.
 
 For more info, see [here](https://openapi-generator.tech/docs/installation).
 
-
 ## CloudHarness command line tools
 To use the cli tools, install requirements first:
 

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
@@ -1,60 +1,11 @@
 {
   "name": "__APP_NAME__",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "prebuild": "eslint . --color",
-    "build": "webpack --config webpack.config.js",
-    "build-dev": "webpack --config webpack.config.js --env mode=development",
-    "prestart": "eslint . --color --fix",
-    "start": "webpack serve --progress  --env DOMAIN=http://localhost:5000 --config webpack.config.dev.js",
-    "start:dev": "webpack serve --progress  --env.DOMAIN=https://__APP_NAME__.cloudharness.metacell.us --config webpack.config.dev.js",
-    "start:local": "webpack serve --progress --env DOMAIN=http://__APP_NAME__.ch.local --config webpack.config.dev.js"
-  },
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "axios": "^0.21.1",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-router": "^5.0.0",
-    "react-router-dom": "^5.0.0",
-    "use-clipboard-copy": "^0.1.2"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.8.3",
-    "@babel/plugin-proposal-class-properties": "^7.8.3",
-    "@babel/preset-env": "^7.8.3",
-    "@babel/preset-react": "^7.8.3",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-module-resolver": "^4.0.0",
-    "babel-preset-minify": "^0.5.1",
-    "clean-webpack-plugin": "^3.0.0",
-    "compression-webpack-plugin": "^7.1.2",
-    "copy-webpack-plugin": "^6.2.1",
-    "css-loader": "^5.2.4",
-    "dotenv": "^16.0.2",
-    "eslint": "5.16.0",
-    "eslint-plugin-jest": "^23.8.2",
-    "eslint-plugin-react": "^7.19.0",
-    "eslint-plugin-react-hooks": "^3.0.0",
-    "file-loader": "^5.0.2",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^5.5.0",
-    "image-webpack-loader": "^8.1.0",
-    "less": "^3.10.3",
-    "less-loader": "^6.1.2",
-    "less-vars-to-js": "^1.3.0",
-    "raw-loader": "^4.0.2",
-    "style-loader": "^1.1.3",
-    "ts-loader": "^9.0.0",
-    "typescript": "^4.8.3",
-    "webpack": "^5.61.0",
-    "webpack-cli": "^4.6.0",
-    "webpack-dev-server": "^4.5.0",
-    "webpack-merge": "^5.7.0"
+    "dev": "vite",
+    "start": "DOMAIN=http://localhost:5000 vite",
+    "start:dev": "DOMAIN=https://test.ch.metacell.us vite",
+    "start:local": "DOMAIN=http://samples.ch vite",
+    "prebuild": "eslint .",
+    "build": "vite build"
   }
 }
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