Merge branch 'main' into test/forms-1528

nimya-aot · Dec 2, 2024 · 58cd154 · 58cd154
2 parents 3348f37 + 721022a
commit 58cd154
Show file tree

Hide file tree

Showing 138 changed files with 7,709 additions and 1,246 deletions.
diff --git a/.devcontainer/chefs_local/local.json.sample b/.devcontainer/chefs_local/local.json.sample
@@ -55,13 +55,28 @@
         "public": {
           "limitApiKey": "120",
           "limitFrontend": "500",
-          "windowMs": "60000",
+          "windowMs": "60000"
         }
       },
       "encryption": {
         "proxy": "352f7c24819086bf3df5a38c1a40586045f73e0007440c9d27d59ee8560e3fe7"
       }
     },
+    "eventStreamService": {
+      "servers": "localhost:4222,localhost:4223,localhost:4224",
+      "websockets": "false",
+      "streamName": "CHEFS",
+      "source": "chefs-local",
+      "domain": "forms",
+      "username": "chefs",
+      "password": "password",
+      "maxAge": "300000",
+      "maxBytes": "1048576",
+      "maxMsgs": "10",
+      "maxMsgSize": "51200",
+      "duplicateWindow": "60000",
+      "numReplicas": "3"
+    },
     "serviceClient": {
       "commonServices": {
         "ches": {

diff --git a/.devcontainer/chefs_local/test.json b/.devcontainer/chefs_local/test.json
@@ -61,6 +61,20 @@
       "proxy": "5fb2054478353fd8d514056d1745b3a9eef066deadda4b90967af7ca65ce6505"
     }
   },
+  "eventStreamService": {
+    "servers": "localhost:4222,localhost:4223,localhost:4224",
+    "streamName": "CHEFS",
+    "source": "chefs",
+    "domain": "forms",
+    "username": "chefs",
+    "password": "password",
+    "maxAge": "900000",
+    "maxBytes": "26214400",
+    "maxMsgs": "500",
+    "maxMsgSize": "50000",
+    "duplicateWindow": "60000",
+    "numReplicas": "3"
+  },
   "serviceClient": {
     "commonServices": {
       "ches": {

diff --git a/.github/actions/deploy-to-environment/action.yaml b/.github/actions/deploy-to-environment/action.yaml
@@ -94,6 +94,15 @@ runs:
       run: |
         oc process --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f openshift/app.cm.yaml -p NAMESPACE=${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -p APP_NAME=${{ inputs.acronym }} -p JOB_NAME=${{ inputs.job_name }} -p SERVER_HOST=${{ inputs.server_host }} -o yaml | oc apply --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f -
 
+    - name: Deploy event stream ConfigMaps
+      shell: bash
+      run: |
+        if [[ "${{ inputs.job_name }}" == pr-* ]]; then
+          oc process --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f openshift/ess.cm.yaml -p APP_NAME=${{ inputs.acronym }} -p JOB_NAME=${{ inputs.job_name }} --param-file=openshift/ess.dev.param -p SOURCE=${{ inputs.job_name }} -o yaml | oc apply --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f -
+        else
+          oc process --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f openshift/ess.cm.yaml -p APP_NAME=${{ inputs.acronym }} -p JOB_NAME=${{ inputs.job_name }} --param-file=openshift/ess.${{ inputs.namespace_environment }}.param -o yaml | oc apply --namespace ${{ inputs.namespace_prefix }}-${{ inputs.namespace_environment }} -f -
+        fi
+
     - name: Deploy App
       shell: bash
       run: |

diff --git a/.gitignore b/.gitignore
@@ -70,3 +70,5 @@ build
 !app/frontend/.env
 !local-infrastructure/.env
 .history
+realm-export.json
+chefs_build
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -48,7 +48,7 @@
       "type": "node",
       "request": "launch",
       "name": "Jest: current file",
-      //"env": { "NODE_ENV": "test" },
+      "env": { "NODE_ENV": "test" },
       "program": "${workspaceFolder}/app/node_modules/.bin/jest",
       "args": [
         "${file}",
@@ -77,6 +77,12 @@
       ],
       "smartStep": true,
       "console": "integratedTerminal"
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Node.js - Debug Current File",
+      "program": "${file}"
     }
   ],
   "version": "0.2.0"

diff --git a/app/app.js b/app/app.js
@@ -13,14 +13,18 @@ const v1Router = require('./src/routes/v1');
 
 const DataConnection = require('./src/db/dataConnection');
 const dataConnection = new DataConnection();
+const { eventStreamService } = require('./src/components/eventStreamService');
+
 const apiRouter = express.Router();
 const state = {
   connections: {
     data: false,
+    eventStreamService: false,
   },
   ready: false,
   shutdown: false,
 };
+
 let probeId;
 const app = express();
 app.use(compression());
@@ -62,6 +66,14 @@ apiRouter.use('/config', (_req, res, next) => {
     // we will need to pass
     const uploads = config.get('files.uploads');
     const feConfig = { ...frontend, uploads: uploads };
+    let ess = config.util.cloneDeep(config.get('eventStreamService'));
+    if (ess) {
+      delete ess['username'];
+      delete ess['password'];
+      feConfig['eventStreamService'] = {
+        ...ess,
+      };
+    }
     res.status(200).json(feConfig);
   } catch (err) {
     next(err);
@@ -160,6 +172,7 @@ function cleanup() {
   log.info('Cleaning up...', { function: 'cleanup' });
   clearInterval(probeId);
 
+  eventStreamService.closeConnection();
   dataConnection.close(() => process.exit());
 
   // Wait 10 seconds max before hard exiting
@@ -173,7 +186,7 @@ function cleanup() {
  */
 function initializeConnections() {
   // Initialize connections and exit if unsuccessful
-  const tasks = [dataConnection.checkAll()];
+  const tasks = [dataConnection.checkAll(), eventStreamService.checkConnection()];
 
   Promise.all(tasks)
     .then((results) => {
@@ -183,9 +196,16 @@ function initializeConnections() {
         log.info('DataConnection Reachable', {
           function: 'initializeConnections',
         });
+
+      state.connections.eventStreamService = results[1];
+      const reachable = state.connections.eventStreamService ? 'Reachable' : 'Unreachable';
+      log.info(`EventStreamService ${reachable}`, {
+        function: 'initializeConnections',
+      });
     })
     .catch((error) => {
       log.error(`Initialization failed: Database OK = ${state.connections.data}`, { function: 'initializeConnections' });
+      log.error(`Initialization failed: EventStreamService OK = ${state.connections.eventStreamService}`, { function: 'initializeConnections' });
       log.error('Connection initialization failure', error.message, {
         function: 'initializeConnections',
       });
@@ -195,7 +215,7 @@ function initializeConnections() {
       }
     })
     .finally(() => {
-      state.ready = Object.values(state.connections).every((x) => x);
+      state.ready = state.connections.data; // only need db running
       if (state.ready) {
         log.info('Service ready to accept traffic', {
           function: 'initializeConnections',
@@ -214,17 +234,21 @@ function initializeConnections() {
 function checkConnections() {
   const wasReady = state.ready;
   if (!state.shutdown) {
-    const tasks = [dataConnection.checkConnection()];
+    const tasks = [dataConnection.checkConnection(), eventStreamService.checkConnection()];
 
     Promise.all(tasks).then((results) => {
       state.connections.data = results[0];
-      state.ready = Object.values(state.connections).every((x) => x);
+      state.connections.eventStreamService = results[1];
+
+      state.ready = state.connections.data; // only want no db to halt application
       if (!wasReady && state.ready)
         log.info('Service ready to accept traffic', {
           function: 'checkConnections',
         });
       log.verbose(state);
       if (!state.ready) {
+        log.error(`Database connected = ${state.connections.data}`, { function: 'checkConnections' });
+        log.error(`EventStreamService connected = ${state.connections.eventStreamService}`, { function: 'checkConnections' });
         process.exitCode = 1;
         shutdown();
       }

diff --git a/app/config/custom-environment-variables.json b/app/config/custom-environment-variables.json
@@ -58,6 +58,21 @@
       "proxy": "SERVER_ENCRYPTION_PROXY"
     }
   },
+  "eventStreamService": {
+    "servers": "EVENTSTREAMSERVICE_SERVERS",
+    "websockets": "EVENTSTREAMSERVICE_WEBSOCKETS",
+    "streamName": "EVENTSTREAMSERVICE_STREAMNAME",
+    "source": "EVENTSTREAMSERVICE_SOURCE",
+    "domain": "EVENTSTREAMSERVICE_DOMAIN",
+    "username": "EVENTSTREAMSERVICE_USERNAME",
+    "password": "EVENTSTREAMSERVICE_PASSWORD",
+    "maxAge": "EVENTSTREAMSERVICE_MAXAGE",
+    "maxBytes": "EVENTSTREAMSERVICE_MAXBYTES",
+    "maxMsgs": "EVENTSTREAMSERVICE_MAXMSGS",
+    "maxMsgSize": "EVENTSTREAMSERVICE_MAXMSGSIZE",
+    "duplicateWindow": "EVENTSTREAMSERVICE_DUPLICATEWINDOW",
+    "numReplicas": "EVENTSTREAMSERVICE_NUMREPLICAS"
+  },
   "serviceClient": {
     "commonServices": {
       "ches": {

diff --git a/app/config/default.json b/app/config/default.json
@@ -62,6 +62,21 @@
       "proxy": "352f7c24819086bf3df5a38c1a40586045f73e0007440c9d27d59ee8560e3fe7"
     }
   },
+  "eventStreamService": {
+    "servers": "localhost:4222,localhost:4223,localhost:4224",
+    "websockets": "false",
+    "streamName": "CHEFS",
+    "source": "chefs-local",
+    "domain": "forms",
+    "username": "chefs",
+    "password": "password",
+    "maxAge": "900000",
+    "maxBytes": "966367641",
+    "maxMsgs": "1000",
+    "maxMsgSize": "966367",
+    "duplicateWindow": "60000",
+    "numReplicas": "3"
+  },
   "serviceClient": {
     "commonServices": {
       "ches": {

diff --git a/app/frontend/package-lock.json b/app/frontend/package-lock.json
diff --git a/app/frontend/package.json b/app/frontend/package.json
@@ -43,6 +43,9 @@
     "font-awesome": "^4.7.0",
     "formiojs": "^4.14.13",
     "keycloak-js": "^21.1.1",
+    "leaflet": "^1.9.4",
+    "leaflet-draw": "^1.0.4",
+    "leaflet-geosearch": "^4.0.0",
     "lodash": "^4.17.21",
     "mitt": "^3.0.0",
     "moment": "^2.29.4",

diff --git a/app/frontend/src/components/designer/FormDesigner.vue b/app/frontend/src/components/designer/FormDesigner.vue
@@ -406,6 +406,7 @@ async function schemaCreateNew() {
     useCase: form.value.useCase,
     labels: form.value.labels,
     formMetadata: form.value.formMetadata,
+    eventStreamConfig: form.value.eventStreamConfig,
   });
   // update user labels with any new added labels
   if (

diff --git a/app/frontend/src/components/designer/FormSettings.vue b/app/frontend/src/components/designer/FormSettings.vue
@@ -1,12 +1,13 @@
 <script setup>
 import { storeToRefs } from 'pinia';
-
 import FormGeneralSettings from '~/components/designer/settings/FormGeneralSettings.vue';
 import FormAccessSettings from '~/components/designer/settings/FormAccessSettings.vue';
 import FormFunctionalitySettings from '~/components/designer/settings/FormFunctionalitySettings.vue';
 import FormSubmissionSettings from '~/components/designer/settings/FormSubmissionSettings.vue';
 import FormScheduleSettings from '~/components/designer/settings/FormScheduleSettings.vue';
 import FormMetadataSettings from '~/components/designer/settings/FormMetadataSettings.vue';
+import FormEventStreamSettings from '~/components/designer/settings/FormEventStreamSettings.vue';
+
 import { useFormStore } from '~/store/form';
 
 defineProps({
@@ -40,6 +41,9 @@ const { form, isFormPublished, isRTL } = storeToRefs(useFormStore());
       <v-col cols="12" md="6">
         <FormMetadataSettings :disabled="disabled" />
       </v-col>
+      <v-col v-if="form.eventStreamConfig.enabled">
+        <FormEventStreamSettings :disabled="disabled" />
+      </v-col>
     </v-row>
   </v-container>
 </template>