From 0fca0adaed676debebdf978255a7c992d973c3a6 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Thu, 26 Oct 2023 12:27:09 -0700 Subject: [PATCH 01/35] openshift build config for debezium-jdbc --- .../templates/etl/debezium-jdbc-build.yaml | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 openshift/templates/etl/debezium-jdbc-build.yaml diff --git a/openshift/templates/etl/debezium-jdbc-build.yaml b/openshift/templates/etl/debezium-jdbc-build.yaml new file mode 100644 index 00000000..d73550fc --- /dev/null +++ b/openshift/templates/etl/debezium-jdbc-build.yaml @@ -0,0 +1,59 @@ +--- +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: "${API_NAME}-build-template" + creationTimestamp: +objects: +- kind: ImageStream + apiVersion: v1 + metadata: + name: "${API_NAME}" +- kind: BuildConfig + apiVersion: v1 + metadata: + name: "${API_NAME}-build" + labels: + app: "${API_NAME}-build" + spec: + runPolicy: Serial + source: + type: Git + git: + uri: "${GIT_REPO_URL}" + ref: "${GIT_REF}" + contextDir: "${SOURCE_CONTEXT_DIR}" + strategy: + type: Docker + dockerStrategy: + dockerfilePath: "${DOCKER_FILE_PATH}" + output: + to: + kind: ImageStreamTag + name: "${API_NAME}:latest" +parameters: +- name: API_NAME + displayName: Name + description: The name assigned to all of the resources defined in this template. + required: true + value: debezium-jdbc +- name: GIT_REPO_URL + displayName: Git Repo URL + description: The URL to your GIT repo. + required: true + value: https://github.com/bcgov/nr-epd-digital-services +- name: GIT_REF + displayName: Git Reference + description: The git reference or branch. + required: true + value: feat/srs-26 +- name: SOURCE_CONTEXT_DIR + displayName: Source Context Directory + description: The source context directory. + required: false + value: etl/debezium-jdbc +- name: DOCKER_FILE_PATH + displayName: Docker File Path + description: The path to the docker file defining the build. + required: false + value: "Dockerfile" From fc08c79905a4df71dcacdd78673e7b51b62bb06c Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Thu, 26 Oct 2023 15:20:46 -0700 Subject: [PATCH 02/35] parameterized env vars --- etl/debezium-jdbc/Dockerfile | 2 +- .../templates/etl/debezium-jdbc-build.yaml | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/etl/debezium-jdbc/Dockerfile b/etl/debezium-jdbc/Dockerfile index 8742d805..ef644797 100644 --- a/etl/debezium-jdbc/Dockerfile +++ b/etl/debezium-jdbc/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /app/ COPY ./ ./ RUN mvn clean install - +RUN echo "DEBEZIUM_VERSION is $DEBEZIUM_VERSION" FROM debezium/connect:$DEBEZIUM_VERSION diff --git a/openshift/templates/etl/debezium-jdbc-build.yaml b/openshift/templates/etl/debezium-jdbc-build.yaml index d73550fc..6c992d99 100644 --- a/openshift/templates/etl/debezium-jdbc-build.yaml +++ b/openshift/templates/etl/debezium-jdbc-build.yaml @@ -27,6 +27,20 @@ objects: type: Docker dockerStrategy: dockerfilePath: "${DOCKER_FILE_PATH}" + env: + - name: "DEBEZIUM_VERSION" + value: "${DEBEZIUM_VERSION}" + - name: "ORACLE_JDBC_VERSION" + value: "${ORACLE_JDBC_VERSION}" + - name: "ORACLE_JDBC_MD5" + value: "${ORACLE_JDBC_MD5}" + - name: "KAFKA_JDBC_VERSION" + value: "${KAFKA_JDBC_VERSION}" + - name: "ORACLE_DB_HOST" + value: "${ORACLE_DB_HOST}" + - name: "ORACLE_DB_PORT" + value: "${ORACLE_DB_PORT}" + output: to: kind: ImageStreamTag @@ -57,3 +71,31 @@ parameters: description: The path to the docker file defining the build. required: false value: "Dockerfile" +- name: DEBEZIUM_VERSION + displayName: Debezium Version + description: Debezium image version. + required: false + value: "1.9" +- name: ORACLE_JDBC_VERSION + displayName: Oracle JDBC Version + description: Oracle JDBC Version. + required: false + value: "21.6.0.0" +- name: ORACLE_JDBC_MD5 + displayName: Oracle JDBC Checksum + description: Oracle JDBC File Checksum. + required: false + value: "312e6f4ec9932bbf74a4461669970c4b" +- name: KAFKA_JDBC_VERSION + displayName: Kafka JDBC Version + description: Kafka Jdbc Version. + required: false + value: "5.3.1" +- name: ORACLE_DB_HOST + displayName: Oracle DB Host + description: Oracle Database Host Name + required: true +- name: ORACLE_DB_PORT + displayName: Oracle DB Port + description: Oracle Database Port. + required: true From 0c90d8294ae531de2929f126ab06380df375de90 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 27 Oct 2023 10:37:42 -0700 Subject: [PATCH 03/35] fix for version format --- openshift/templates/etl/debezium-jdbc-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/templates/etl/debezium-jdbc-build.yaml b/openshift/templates/etl/debezium-jdbc-build.yaml index 6c992d99..b8cdd232 100644 --- a/openshift/templates/etl/debezium-jdbc-build.yaml +++ b/openshift/templates/etl/debezium-jdbc-build.yaml @@ -29,7 +29,7 @@ objects: dockerfilePath: "${DOCKER_FILE_PATH}" env: - name: "DEBEZIUM_VERSION" - value: "${DEBEZIUM_VERSION}" + value: ${DEBEZIUM_VERSION} - name: "ORACLE_JDBC_VERSION" value: "${ORACLE_JDBC_VERSION}" - name: "ORACLE_JDBC_MD5" From 61ed7b39ccb53f886e76b00d37826e01e7fa75de Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 27 Oct 2023 10:53:10 -0700 Subject: [PATCH 04/35] fix format issue --- openshift/templates/etl/debezium-jdbc-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/templates/etl/debezium-jdbc-build.yaml b/openshift/templates/etl/debezium-jdbc-build.yaml index b8cdd232..a26d9a33 100644 --- a/openshift/templates/etl/debezium-jdbc-build.yaml +++ b/openshift/templates/etl/debezium-jdbc-build.yaml @@ -75,7 +75,7 @@ parameters: displayName: Debezium Version description: Debezium image version. required: false - value: "1.9" + value: 1.9 - name: ORACLE_JDBC_VERSION displayName: Oracle JDBC Version description: Oracle JDBC Version. From 02469eeb30091d351b20665da8f4cb7a245b7b0c Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 27 Oct 2023 11:00:00 -0700 Subject: [PATCH 05/35] try with hard coded var --- openshift/templates/etl/debezium-jdbc-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openshift/templates/etl/debezium-jdbc-build.yaml b/openshift/templates/etl/debezium-jdbc-build.yaml index a26d9a33..6c992d99 100644 --- a/openshift/templates/etl/debezium-jdbc-build.yaml +++ b/openshift/templates/etl/debezium-jdbc-build.yaml @@ -29,7 +29,7 @@ objects: dockerfilePath: "${DOCKER_FILE_PATH}" env: - name: "DEBEZIUM_VERSION" - value: ${DEBEZIUM_VERSION} + value: "${DEBEZIUM_VERSION}" - name: "ORACLE_JDBC_VERSION" value: "${ORACLE_JDBC_VERSION}" - name: "ORACLE_JDBC_MD5" @@ -75,7 +75,7 @@ parameters: displayName: Debezium Version description: Debezium image version. required: false - value: 1.9 + value: "1.9" - name: ORACLE_JDBC_VERSION displayName: Oracle JDBC Version description: Oracle JDBC Version. From 09417d2453a723d4cbad266d6e33a48b52ffd0af Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 27 Oct 2023 11:11:11 -0700 Subject: [PATCH 06/35] hard code version --- etl/debezium-jdbc/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etl/debezium-jdbc/Dockerfile b/etl/debezium-jdbc/Dockerfile index ef644797..997ff2ac 100644 --- a/etl/debezium-jdbc/Dockerfile +++ b/etl/debezium-jdbc/Dockerfile @@ -7,7 +7,7 @@ RUN mvn clean install RUN echo "DEBEZIUM_VERSION is $DEBEZIUM_VERSION" -FROM debezium/connect:$DEBEZIUM_VERSION +FROM debezium/connect:1.9 ARG ORACLE_JDBC_VERSION ARG ORACLE_JDBC_MD5 From f0f2ed26f2af5c76ef0636ba354b8d4adedc4ef8 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 27 Oct 2023 16:13:29 -0700 Subject: [PATCH 07/35] build config for postgis --- .../templates/etl/debezium-postgis-build.yaml | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 openshift/templates/etl/debezium-postgis-build.yaml diff --git a/openshift/templates/etl/debezium-postgis-build.yaml b/openshift/templates/etl/debezium-postgis-build.yaml new file mode 100644 index 00000000..fafe0667 --- /dev/null +++ b/openshift/templates/etl/debezium-postgis-build.yaml @@ -0,0 +1,87 @@ +--- +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + name: "${API_NAME}-build-template" + creationTimestamp: +objects: +- kind: ImageStream + apiVersion: v1 + metadata: + name: "${API_NAME}" +- kind: BuildConfig + apiVersion: v1 + metadata: + name: "${API_NAME}-build" + labels: + app: "${API_NAME}-build" + spec: + runPolicy: Serial + source: + type: Git + git: + uri: "${GIT_REPO_URL}" + ref: "${GIT_REF}" + contextDir: "${SOURCE_CONTEXT_DIR}" + strategy: + type: Docker + dockerStrategy: + dockerfilePath: "${DOCKER_FILE_PATH}" + output: + to: + kind: ImageStreamTag + name: "${API_NAME}:latest" +parameters: +- name: API_NAME + displayName: Name + description: The name assigned to all of the resources defined in this template. + required: true + value: debezium-postgis +- name: GIT_REPO_URL + displayName: Git Repo URL + description: The URL to your GIT repo. + required: true + value: https://github.com/bcgov/nr-epd-digital-services +- name: GIT_REF + displayName: Git Reference + description: The git reference or branch. + required: true + value: feat/srs-26 +- name: SOURCE_CONTEXT_DIR + displayName: Source Context Directory + description: The source context directory. + required: false + value: etl/debezium-postgis +- name: DOCKER_FILE_PATH + displayName: Docker File Path + description: The path to the docker file defining the build. + required: false + value: "Dockerfile" +- name: DEBEZIUM_VERSION + displayName: Debezium Version + description: Debezium image version. + required: false + value: "1.9" +- name: ORACLE_JDBC_VERSION + displayName: Oracle JDBC Version + description: Oracle JDBC Version. + required: false + value: "21.6.0.0" +- name: ORACLE_JDBC_MD5 + displayName: Oracle JDBC Checksum + description: Oracle JDBC File Checksum. + required: false + value: "312e6f4ec9932bbf74a4461669970c4b" +- name: KAFKA_JDBC_VERSION + displayName: Kafka JDBC Version + description: Kafka Jdbc Version. + required: false + value: "5.3.1" +- name: ORACLE_DB_HOST + displayName: Oracle DB Host + description: Oracle Database Host Name + required: true +- name: ORACLE_DB_PORT + displayName: Oracle DB Port + description: Oracle Database Port. + required: true From 814754110421a9c974a569f7d710aaffc5fb71c0 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 27 Oct 2023 16:18:48 -0700 Subject: [PATCH 08/35] path correction --- openshift/templates/etl/debezium-postgis-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/templates/etl/debezium-postgis-build.yaml b/openshift/templates/etl/debezium-postgis-build.yaml index fafe0667..270d4990 100644 --- a/openshift/templates/etl/debezium-postgis-build.yaml +++ b/openshift/templates/etl/debezium-postgis-build.yaml @@ -51,7 +51,7 @@ parameters: displayName: Source Context Directory description: The source context directory. required: false - value: etl/debezium-postgis + value: etl/debezium-postgis/15-3.3 - name: DOCKER_FILE_PATH displayName: Docker File Path description: The path to the docker file defining the build. From ff6770f90b8d3e4e230bcf4424870782f50bc727 Mon Sep 17 00:00:00 2001 From: sakthi-aot <81777282+sakthi-aot@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:03:53 -0600 Subject: [PATCH 09/35] adding the template files-backupcontainers (#558) --- .../templates/backup-container/backup.conf | 5 + .../backup-container/backup_build.yaml | 74 +++ .../backup-container/backup_deploy.yaml | 447 ++++++++++++++++++ .../templates/backup-container/readme.md | 7 + 4 files changed, 533 insertions(+) create mode 100644 openshift/templates/backup-container/backup.conf create mode 100644 openshift/templates/backup-container/backup_build.yaml create mode 100644 openshift/templates/backup-container/backup_deploy.yaml create mode 100644 openshift/templates/backup-container/readme.md diff --git a/openshift/templates/backup-container/backup.conf b/openshift/templates/backup-container/backup.conf new file mode 100644 index 00000000..be57b395 --- /dev/null +++ b/openshift/templates/backup-container/backup.conf @@ -0,0 +1,5 @@ +postgres=keycloak-db:5432/keycloak-db + +# Backup at 1am PST, and verify backups at 4am PST. +0 1 * * * default ./backup.sh -s +0 4 * * * default ./backup.sh -s -v all diff --git a/openshift/templates/backup-container/backup_build.yaml b/openshift/templates/backup-container/backup_build.yaml new file mode 100644 index 00000000..31069acf --- /dev/null +++ b/openshift/templates/backup-container/backup_build.yaml @@ -0,0 +1,74 @@ +kind: Template +apiVersion: "template.openshift.io/v1" +metadata: + name: ${NAME}-build-template + creationTimestamp: null +objects: + - kind: ImageStream + apiVersion: v1 + metadata: + name: ${NAME} + - kind: BuildConfig + apiVersion: v1 + metadata: + name: ${NAME} + labels: + app: ${NAME} + spec: + triggers: + - type: ImageChange + - type: ConfigChange + runPolicy: Serial + source: + type: Git + git: + uri: ${GIT_REPO_URL} + ref: ${GIT_REF} + contextDir: ${SOURCE_CONTEXT_DIR} + strategy: + type: Docker + dockerStrategy: + from: + kind: DockerImage + name: ${BASE_IMAGE_FOR_BUILD} + dockerfilePath: ${DOCKER_FILE_PATH} + output: + to: + kind: ImageStreamTag + name: ${NAME}:${OUTPUT_IMAGE_TAG} +parameters: + - name: NAME + displayName: Name + description: The name assigned to all of the resources. Use 'backup-{database name}' depending on your database provider + required: true + value: backup-postgres + - name: GIT_REPO_URL + displayName: Git Repo URL + description: The URL to your GIT repo. + required: true + value: https://github.com/BCDevOps/backup-container.git + - name: GIT_REF + displayName: Git Reference + description: The git reference or branch. + required: true + value: master + - name: SOURCE_CONTEXT_DIR + displayName: Source Context Directory + description: The source context directory. + required: false + value: /docker + - name: DOCKER_FILE_PATH + displayName: Docker File + description: The path and file of the docker file defining the build. Choose either 'Dockerfile' for Postgres builds or 'Dockerfile_Mongo' for MongoDB builds or 'Dockerfile_MSSQL' for MSSQL builds. + required: false + value: Dockerfile + - name: OUTPUT_IMAGE_TAG + displayName: Output Image Tag + description: The tag given to the built image. + required: true + value: latest + - name: BASE_IMAGE_FOR_BUILD + displayName: FROM Image Tag + description: Base image to build from. Docker creds or Artificatory setup may be needed to alleviate docker rate-limiting + required: true + value: docker.io/centos/postgresql-12-centos7:20200917-804ef01 \ No newline at end of file diff --git a/openshift/templates/backup-container/backup_deploy.yaml b/openshift/templates/backup-container/backup_deploy.yaml new file mode 100644 index 00000000..ab1e60cf --- /dev/null +++ b/openshift/templates/backup-container/backup_deploy.yaml @@ -0,0 +1,447 @@ +kind: Template +apiVersion: "template.openshift.io/v1" +metadata: + name: ${NAME}-deployment-template +objects: + - kind: NetworkPolicy + apiVersion: networking.k8s.io/v1 + metadata: + name: ${NAME} + labels: + name: ${NAME} + app: ${APP_NAME} + env: ${TAG_NAME} + spec: + description: | + Allow the ${NAME} to access databases in this namespace. + ingress: + - from: + - podSelector: + matchLabels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + namespaceSelector: + matchLabels: + name: ${NAMESPACE_NAME} + environment: ${TAG_NAME} + podSelector: + matchLabels: + backup: "true" + env: ${TAG_NAME} + + - kind: PersistentVolumeClaim + apiVersion: v1 + metadata: + name: ${BACKUP_VOLUME_NAME} + labels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + spec: + storageClassName: ${BACKUP_VOLUME_CLASS} + accessModes: + - ReadWriteMany + resources: + requests: + storage: ${BACKUP_VOLUME_SIZE} + + - kind: PersistentVolumeClaim + apiVersion: v1 + metadata: + name: ${VERIFICATION_VOLUME_NAME} + labels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + spec: + storageClassName: ${VERIFICATION_VOLUME_CLASS} + accessModes: + - ReadWriteOnce + resources: + requests: + storage: ${VERIFICATION_VOLUME_SIZE} + + - kind: Secret + apiVersion: v1 + metadata: + name: ${NAME} + labels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + type: Opaque + stringData: + webhook-url: ${WEBHOOK_URL} + webhook-url-host: ${WEBHOOK_URL_HOST} + + - kind: Secret + apiVersion: v1 + metadata: + name: ${FTP_SECRET_KEY} + labels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + type: Opaque + stringData: + ftp-url: ${FTP_URL} + ftp-user: ${FTP_USER} + ftp-password: ${FTP_PASSWORD} + ftp-url-host: ${FTP_URL_HOST} + + - kind: DeploymentConfig + apiVersion: v1 + metadata: + name: ${NAME} + labels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + spec: + strategy: + type: Recreate + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - ${NAME} + from: + kind: ImageStreamTag + namespace: ${IMAGE_NAMESPACE} + name: ${SOURCE_IMAGE_NAME}:${TAG_NAME} + replicas: 1 + selector: + name: ${NAME} + template: + metadata: + name: ${NAME} + labels: + name: ${NAME} + app: ${APP_NAME} + role: ${ROLE} + env: ${TAG_NAME} + spec: + volumes: + - name: ${BACKUP_VOLUME_NAME} + persistentVolumeClaim: + claimName: ${BACKUP_VOLUME_NAME} + - name: ${VERIFICATION_VOLUME_NAME} + persistentVolumeClaim: + claimName: ${VERIFICATION_VOLUME_NAME} + - name: ${NAME}-config-volume + configMap: + name: ${CONFIG_MAP_NAME} + items: + - key: ${CONFIG_FILE_NAME} + path: ${CONFIG_FILE_NAME} + containers: + - name: ${NAME} + image: "" + ports: [] + env: + - name: BACKUP_STRATEGY + value: ${BACKUP_STRATEGY} + - name: BACKUP_DIR + value: ${BACKUP_DIR} + - name: NUM_BACKUPS + value: ${NUM_BACKUPS} + - name: DAILY_BACKUPS + value: ${DAILY_BACKUPS} + - name: WEEKLY_BACKUPS + value: ${WEEKLY_BACKUPS} + - name: MONTHLY_BACKUPS + value: ${MONTHLY_BACKUPS} + - name: BACKUP_PERIOD + value: ${BACKUP_PERIOD} + - name: DATABASE_SERVICE_NAME + value: ${DATABASE_SERVICE_NAME} + - name: DATABASE_NAME + value: ${DATABASE_NAME} + - name: MONGODB_AUTHENTICATION_DATABASE + value: ${MONGODB_AUTHENTICATION_DATABASE} + - name: TABLE_SCHEMA + value: ${TABLE_SCHEMA} + - name: DATABASE_USER + valueFrom: + secretKeyRef: + name: ${DATABASE_DEPLOYMENT_NAME} + key: ${DATABASE_USER_KEY_NAME} + - name: DATABASE_PASSWORD + valueFrom: + secretKeyRef: + name: ${DATABASE_DEPLOYMENT_NAME} + key: ${DATABASE_PASSWORD_KEY_NAME} + - name: FTP_URL + valueFrom: + secretKeyRef: + name: ${FTP_SECRET_KEY} + key: ftp-url + - name: FTP_USER + valueFrom: + secretKeyRef: + name: ${FTP_SECRET_KEY} + key: ftp-user + - name: FTP_PASSWORD + valueFrom: + secretKeyRef: + name: ${FTP_SECRET_KEY} + key: ftp-password + - name: WEBHOOK_URL + valueFrom: + secretKeyRef: + name: ${NAME} + key: webhook-url + - name: ENVIRONMENT_FRIENDLY_NAME + value: ${ENVIRONMENT_FRIENDLY_NAME} + - name: ENVIRONMENT_NAME + value: ${ENVIRONMENT_NAME} + resources: + requests: + cpu: ${CPU_REQUEST} + memory: ${MEMORY_REQUEST} + limits: + cpu: ${CPU_LIMIT} + memory: ${MEMORY_LIMIT} + volumeMounts: + - name: ${BACKUP_VOLUME_NAME} + mountPath: ${BACKUP_DIR} + - name: ${VERIFICATION_VOLUME_NAME} + mountPath: ${VERIFICATION_VOLUME_MOUNT_PATH} + - name: ${NAME}-config-volume + mountPath: ${CONFIG_MOUNT_PATH}${CONFIG_FILE_NAME} + subPath: ${CONFIG_FILE_NAME} + +parameters: + - name: NAME + displayName: Name + description: The name assigned to all of the resources. Use 'backup-{database name}' depending on your database provider + required: true + value: backup-postgres + - name: SOURCE_IMAGE_NAME + displayName: Source Image Name + description: The name of the image to use for this resource. Use 'backup-{database name}' depending on your database provider + required: true + value: backup-postgres + - name: APP_NAME + displayName: App Name + description: Used to group resources together. Defaults to backup-container + required: true + value: backup-container + - name: ROLE + displayName: ROLE + description: The role assigned to all of the resources. Defaults to backup-container + required: true + value: backup-container + - name: NAMESPACE_NAME + displayName: Namespace Name + description: The name of the namespace being deployed to.. + required: true + value: devex-von-image + - name: IMAGE_NAMESPACE + displayName: Image Namespace + description: The namespace of the OpenShift project containing the imagestream for the application. + required: true + value: + - name: TAG_NAME + displayName: Environment TAG name + description: The TAG name for this environment, e.g., dev, test, prod + required: true + value: dev + - name: DATABASE_SERVICE_NAME + displayName: Database Service Name + description: Used for backward compatibility only. Not needed when using the recommended 'backup.conf' configuration. The name of the database service. + required: false + value: "" + - name: DATABASE_NAME + displayName: Database Name + description: Used for backward compatibility only. Not needed when using the recommended 'backup.conf' configuration. The name of the database. + required: false + value: "" + - name: MONGODB_AUTHENTICATION_DATABASE + displayName: MongoDB Authentication Database + description: This is only required if you are backing up mongo database with a separate authentication database. + required: false + value: "" + - name: DATABASE_DEPLOYMENT_NAME + displayName: Database Deployment Name + description: The name associated to the database deployment resources. In particular, this is used to wire up the credentials associated to the database. + required: true + value: postgresql + - name: DATABASE_USER_KEY_NAME + displayName: Database User Key Name + description: The database user key name stored in database deployment resources specified by DATABASE_DEPLOYMENT_NAME. + required: true + value: database-user + - name: DATABASE_PASSWORD_KEY_NAME + displayName: Database Password Key Name + description: The database password key name stored in database deployment resources specified by DATABASE_DEPLOYMENT_NAME. + required: true + value: database-password + - name: MSSQL_SA_PASSWORD + displayName: MSSQL SA Password + description: The database password to use for the local backup database. + required: false + - name: TABLE_SCHEMA + displayName: Table Schema + description: The table schema for your database. Used for Postgres backups. + required: true + value: public + - name: BACKUP_STRATEGY + displayName: Backup Strategy + description: The strategy to use for backups; for example daily, or rolling. + required: true + value: rolling + - name: FTP_SECRET_KEY + displayName: FTP Secret Key + description: The FTP secret key is used to wire up the credentials associated to the FTP. + required: false + value: ftp-secret + - name: FTP_URL + displayName: FTP Server URL + description: The URL of the backup FTP server + required: false + value: "" + - name: FTP_URL_HOST + displayName: Ftp URL Hostname + description: Ftp URL Hostname. The backup-deploy.overrides.sh will parse this from the supplied FTP_URL, and fetch it from a secret for updates. + required: false + value: + - name: FTP_USER + displayName: FTP user name + description: FTP user name + required: false + value: "" + - name: FTP_PASSWORD + displayName: FTP password + description: FTP password + required: false + value: "" + - name: WEBHOOK_URL + displayName: Webhook URL + description: The URL of the webhook to use for notifications. If not specified, the webhook integration feature is disabled. + required: false + value: "" + - name: WEBHOOK_URL_HOST + displayName: Webhook URL Hostname + description: Webhook URL Hostname. The backup-deploy.overrides.sh will parse this from the supplied WEBHOOK_URL, and fetch it from a secret for updates. + required: false + value: + - name: ENVIRONMENT_FRIENDLY_NAME + displayName: Friendly Environment Name + description: The human readable name of the environment. This variable is used by the webhook integration to identify the environment in which the backup notifications originate. + required: false + value: "" + - name: ENVIRONMENT_NAME + displayName: Environment Name (Environment Id) + description: The name or Id of the environment. This variable is used by the webhook integration and by the NetworkSecurityPolicies to identify the environment in which the backup notifications originate. + required: true + value: "" + - name: BACKUP_DIR + displayName: The root backup directory + description: The name of the root backup directory. The backup volume will be mounted to this directory. + required: true + value: /backups/ + - name: NUM_BACKUPS + displayName: The number of backup files to be retained + description: Used for backward compatibility only. Ignored when using the recommended `rolling` backup strategy. The number of backup files to be retained. Used for the `daily` backup strategy. + required: false + value: "" + - name: DAILY_BACKUPS + displayName: Number of Daily Backups to Retain + description: The number of daily backup files to be retained. Used for the `rolling` backup strategy. + required: false + value: "" + - name: WEEKLY_BACKUPS + displayName: Number of Weekly Backups to Retain + description: The number of weekly backup files to be retained. Used for the `rolling` backup strategy. + required: false + value: "" + - name: MONTHLY_BACKUPS + displayName: Number of Monthly Backups to Retain + description: The number of monthly backup files to be retained. Used for the `rolling` backup strategy. + required: false + value: "" + - name: BACKUP_PERIOD + displayName: Period (d,m,s) between backups in a format used by the sleep command + description: Used for backward compatibility only. Ignored when using the recommended `backup.conf` and cron backup strategy. Period (d,m,s) between backups in a format used by the sleep command + required: false + value: "" + - name: CONFIG_FILE_NAME + displayName: Config File Name + description: The name of the configuration file. + required: true + value: backup.conf + - name: CONFIG_MAP_NAME + displayName: Config Map Name + description: The name of the configuration map. + required: true + value: backup-conf + - name: CONFIG_MOUNT_PATH + displayName: Config Mount Path + description: The path to use to mount the config file. + required: true + value: / + - name: BACKUP_VOLUME_NAME + displayName: Backup Volume Name + description: The name of the persistent volume used to store the backups. + required: true + value: backup + - name: BACKUP_VOLUME_SIZE + displayName: Backup Volume Size + description: The size of the persistent volume used to store the backups, e.g. 512Mi, 1Gi, 2Gi. Ensure this is sized correctly. Refer to the container documentation for details. + required: true + value: 5Gi + - name: BACKUP_VOLUME_CLASS + displayName: Backup Volume Class + description: The class of the persistent volume used to store the backups; netapp-file-standard is the recommended default. + required: true + value: netapp-file-backup + - name: VERIFICATION_VOLUME_NAME + displayName: Verification Volume Name + description: The name for the verification volume, used for restoring and verifying backups. + required: false + value: backup-verification + - name: VERIFICATION_VOLUME_SIZE + displayName: Backup Volume Size + description: The size of the persistent volume used for restoring and verifying backups, e.g. 512Mi, 1Gi, 2Gi. Ensure this is sized correctly. It should be large enough to contain your largest database. + required: true + value: 1Gi + - name: VERIFICATION_VOLUME_CLASS + displayName: Backup Volume Class + description: The class of the persistent volume used for restoring and verifying backups; netapp-file-standard, netapp-block-standard. + required: true + value: netapp-file-standard + - name: VERIFICATION_VOLUME_MOUNT_PATH + displayName: Verification Volume Mount Path + description: The path on which to mount the verification volume. This is used by the database server to contain the database configuration and data files. For Mongo, please use /var/lib/mongodb/data . For MSSQL, please use /var/opt/mssql/data. For MariaDB, please use /var/lib/mysql/data + required: true + value: /var/lib/pgsql/data + - name: CPU_REQUEST + displayName: Resources CPU Request + description: The resources CPU request (in cores) for this build. + required: true + value: "0" + - name: CPU_LIMIT + displayName: Resources CPU Limit + description: The resources CPU limit (in cores) for this build. + required: true + value: "0" + - name: MEMORY_REQUEST + displayName: Resources Memory Request + description: The resources Memory request (in Mi, Gi, etc) for this build. + required: true + value: 0Mi + - name: MEMORY_LIMIT + displayName: Resources Memory Limit + description: The resources Memory limit (in Mi, Gi, etc) for this build. + required: true + value: 0Mi \ No newline at end of file diff --git a/openshift/templates/backup-container/readme.md b/openshift/templates/backup-container/readme.md new file mode 100644 index 00000000..fc9f4b33 --- /dev/null +++ b/openshift/templates/backup-container/readme.md @@ -0,0 +1,7 @@ +# To deploy the template files +oc -n e38158-test process -f backup_build_keycloak_db.yml -p NAME=database-backup OUTPUT_IMAGE_TAG=v1 -p BASE_IMAGE_FOR_BUILD=quay.io/fedora/postgresql-14:14 | oc -n e38158-test apply -f - + +oc -n e38158-test create configmap keycloak-backup.conf --from-file=keycloak-backup.conf + + +oc -n e38158-test process -f backup_deploy.yml -p NAME=keycloak-db-backup -p IMAGE_NAMESPACE=e38158-test -p SOURCE_IMAGE_NAME=database-backup -p TAG_NAME=v1 -p FTP_SECRET_KEY=epd-database-backup-ftp-secret -p BACKUP_VOLUME_NAME=keycloak-db-backup-pvc -p BACKUP_VOLUME_SIZE=1Gi -p VERIFICATION_VOLUME_SIZE=1Gi -p ENVIRONMENT_NAME=e38158-test -p CONFIG_MAP_NAME=keycloak-backup.conf -p CUSTOM_CONFIG_FILE_NAME=keycloak-backup.conf -p VERIFICATION_VOLUME_NAME=keycloak-db-backup-verification-pvc -p DATABASE_DEPLOYMENT_NAME=keycloak-db -p DATABASE_USER_KEY_NAME=database-user -p DATABASE_PASSWORD_KEY_NAME=database-password -p ENVIRONMENT_FRIENDLY_NAME="Keycloak Database e38158-test POSTGRESQL DB Backups" -p TABLE_SCHEMA="public" | oc -n e38158-test apply -f - \ No newline at end of file From e2651c3d90314ed2ee971b2ffb51f517dcc47180 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Mon, 30 Oct 2023 17:46:49 -0700 Subject: [PATCH 10/35] update fix the nom/nir form --- ...tification of Independent Remediation.json | 32 +++++++++---------- ...ication of Likely or Actual Migration.json | 20 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json index f97ec85e..c6a4aa9e 100644 --- a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json +++ b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json @@ -441,7 +441,7 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n\r\n{% if(groups.includes(\"/formsflow/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% if(component.label === 'Notes') { %}\r\n
{{ t(component.label) }}
\r\n {% } else if(component.key !== 'comments') { %}\r\n
{{ t(component.label) }}
\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } else { %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ t(component.label)}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ t(component.label)}}
\r\n{% } else { %}\r\n
{{ t(component.label)}}
\r\n{% } %} \r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } %}", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", "row": "\r\n\r\n{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% console.log('rendering edit grid body')%}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n\r\n\r\n\r\n
\r\n\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% console.log(\"row-key\",component.key,row[component.key]) %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n{% if(component.key == 'comments') { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{% } else { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{%}%}\r\n \r\n\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n \r\n {% } %}\r\n {% } %}\r\n
\r\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% console.log('for sia') %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } %} \r\n \r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n {% } %}\r\n
\r\n {% } %}\r\n \r\n \r\n \r\n{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", @@ -588,7 +588,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "e4fc3qw" + "id": "e9hosx" } ], "width": 4, @@ -680,7 +680,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "eut4i8p" + "id": "ecfcvd" } ], "width": 2, @@ -767,7 +767,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e0r0pe" + "id": "e16qs9g" } ], "size": "md", @@ -854,7 +854,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e0qx6r5" + "id": "ea0a6k3" } ], "size": "md", @@ -941,7 +941,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "eaf97yl" + "id": "ezrqe67" } ], "size": "md", @@ -1016,7 +1016,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "e9w4cmj" + "id": "em2rzym" } ], "placeholder": "", @@ -1035,7 +1035,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "emybtj9" + "id": "e62bz6a" }, { "id": "ecf3gbp", @@ -9078,7 +9078,7 @@ "attributes": {}, "components": [ { - "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -9155,7 +9155,7 @@ "truncateMultipleSpaces": false }, { - "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -9900,7 +9900,7 @@ "attributes": {}, "components": [ { - "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -9977,7 +9977,7 @@ "truncateMultipleSpaces": false }, { - "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -10719,7 +10719,7 @@ "attributes": {}, "components": [ { - "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -10796,7 +10796,7 @@ "truncateMultipleSpaces": false }, { - "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -11544,7 +11544,7 @@ "attributes": {}, "components": [ { - "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -11621,7 +11621,7 @@ "truncateMultipleSpaces": false }, { - "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json b/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json index 33bb9539..c5d3e093 100644 --- a/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json +++ b/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json @@ -456,7 +456,7 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n\r\n{% if(groups.includes(\"/formsflow/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% if(component.label === 'Notes') { %}\r\n
{{ t(component.label) }}
\r\n {% } else if(component.key !== 'comments') { %}\r\n
{{ t(component.label) }}
\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } else { %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ t(component.label)}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ t(component.label)}}
\r\n{% } else { %}\r\n
{{ t(component.label)}}
\r\n{% } %} \r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } %}", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", "row": "\n\n{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% console.log('rendering edit grid body')%}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n\n\n\n
\n\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% console.log(\"row-key\",component.key,row[component.key]) %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n{% if(component.key == 'comments') { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{% } else { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{%}%}\n \n\n {% } %}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n \n {% } %}\n {% } %}\n
\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/cssa-manager\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\n
\n {% util.eachComponent(components, function(component) { %}\n {% console.log('for sia') %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ getView(component, row[component.key])}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ getView(component, row[component.key])}}
\n{% } else { %}\n
{{ getView(component, row[component.key])}}
\n{% } %} \n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n {% } %}\n
\n {% } %}\n \n \n \n{% const emptyElements = []; %}\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\n{% for (let i = 0; i < elements.length; i++) { %}\n{% const element = elements[i]; %}\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", @@ -603,7 +603,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "eq4yyt" + "id": "ela7omc" } ], "width": 4, @@ -695,7 +695,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "e11p497" + "id": "eexfsk" } ], "width": 2, @@ -782,7 +782,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e1d5fun" + "id": "ehhwtd" } ], "size": "md", @@ -869,7 +869,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "espac7p" + "id": "e5gjfmk" } ], "size": "md", @@ -956,7 +956,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "emh5fwc" + "id": "eaf2si" } ], "size": "md", @@ -1031,7 +1031,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "eb9exon" + "id": "evpk8rp" } ], "placeholder": "", @@ -1050,7 +1050,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "eskandg" + "id": "e9by52h" }, { "id": "evi8v2p", @@ -1213,7 +1213,7 @@ "attributes": {}, "components": [ { - "id": "ea2btv00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ea2btv00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "Panel-InformationForAffectedAndLikelyAffectedParcels", "tree": false, "type": "panel", @@ -9085,7 +9085,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "emrk44b0000000000000000" + "id": "emrk44b0000000000000000000" } ], "errorLabel": "", From 4a8e55474e5d9d67970b0746cc8b5d64bd47a8d6 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Tue, 31 Oct 2023 09:57:17 -0700 Subject: [PATCH 11/35] fix visibility column displayed for site-owner --- ...tification of Independent Remediation.json | 32 +++++++++---------- ...ication of Likely or Actual Migration.json | 20 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json index c6a4aa9e..e79072a5 100644 --- a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json +++ b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json @@ -441,7 +441,7 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", "row": "\r\n\r\n{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% console.log('rendering edit grid body')%}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n\r\n\r\n\r\n
\r\n\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% console.log(\"row-key\",component.key,row[component.key]) %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n{% if(component.key == 'comments') { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{% } else { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{%}%}\r\n \r\n\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n \r\n {% } %}\r\n {% } %}\r\n
\r\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% console.log('for sia') %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } %} \r\n \r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n {% } %}\r\n
\r\n {% } %}\r\n \r\n \r\n \r\n{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", @@ -588,7 +588,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "e9hosx" + "id": "eg5nycl" } ], "width": 4, @@ -680,7 +680,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "ecfcvd" + "id": "eemn8j" } ], "width": 2, @@ -767,7 +767,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e16qs9g" + "id": "ekujf" } ], "size": "md", @@ -854,7 +854,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ea0a6k3" + "id": "ejtmegx" } ], "size": "md", @@ -941,7 +941,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ezrqe67" + "id": "e92ykyh" } ], "size": "md", @@ -1016,7 +1016,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "em2rzym" + "id": "eq9y9ki" } ], "placeholder": "", @@ -1035,7 +1035,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "e62bz6a" + "id": "e49d927" }, { "id": "ecf3gbp", @@ -9078,7 +9078,7 @@ "attributes": {}, "components": [ { - "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -9155,7 +9155,7 @@ "truncateMultipleSpaces": false }, { - "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -9900,7 +9900,7 @@ "attributes": {}, "components": [ { - "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -9977,7 +9977,7 @@ "truncateMultipleSpaces": false }, { - "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -10719,7 +10719,7 @@ "attributes": {}, "components": [ { - "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -10796,7 +10796,7 @@ "truncateMultipleSpaces": false }, { - "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -11544,7 +11544,7 @@ "attributes": {}, "components": [ { - "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -11621,7 +11621,7 @@ "truncateMultipleSpaces": false }, { - "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json b/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json index c5d3e093..dd6d423e 100644 --- a/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json +++ b/forms-flow-ai/epd-forms/bundling/Notification of Likely or Actual Migration.json @@ -456,7 +456,7 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", "row": "\n\n{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% console.log('rendering edit grid body')%}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n\n\n\n
\n\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% console.log(\"row-key\",component.key,row[component.key]) %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n{% if(component.key == 'comments') { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{% } else { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{%}%}\n \n\n {% } %}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n \n {% } %}\n {% } %}\n
\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/cssa-manager\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\n
\n {% util.eachComponent(components, function(component) { %}\n {% console.log('for sia') %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ getView(component, row[component.key])}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ getView(component, row[component.key])}}
\n{% } else { %}\n
{{ getView(component, row[component.key])}}
\n{% } %} \n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n {% } %}\n
\n {% } %}\n \n \n \n{% const emptyElements = []; %}\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\n{% for (let i = 0; i < elements.length; i++) { %}\n{% const element = elements[i]; %}\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", @@ -603,7 +603,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "ela7omc" + "id": "egyqbwu" } ], "width": 4, @@ -695,7 +695,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "eexfsk" + "id": "efp1n2" } ], "width": 2, @@ -782,7 +782,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ehhwtd" + "id": "ehsbjkg" } ], "size": "md", @@ -869,7 +869,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e5gjfmk" + "id": "e8afsa9" } ], "size": "md", @@ -956,7 +956,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "eaf2si" + "id": "ee0j5y" } ], "size": "md", @@ -1031,7 +1031,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "evpk8rp" + "id": "ecpzuu" } ], "placeholder": "", @@ -1050,7 +1050,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "e9by52h" + "id": "e8fn76k" }, { "id": "evi8v2p", @@ -1213,7 +1213,7 @@ "attributes": {}, "components": [ { - "id": "ea2btv00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ea2btv00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "Panel-InformationForAffectedAndLikelyAffectedParcels", "tree": false, "type": "panel", @@ -9085,7 +9085,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "emrk44b0000000000000000000" + "id": "emrk44b0000000000000000000000" } ], "errorLabel": "", From 406755191740472892dc861928ec37bab79d02a8 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Tue, 31 Oct 2023 10:25:27 -0700 Subject: [PATCH 12/35] removed stamp section in DERA form --- ... Ecological Risk Assessment Checklist.json | 74 +------------------ 1 file changed, 3 insertions(+), 71 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json index 52f24553..9f22932a 100644 --- a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json +++ b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json @@ -5488,7 +5488,7 @@ "attributes": {}, "components": [ { - "id": "eh8z2bfa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eh8z2bfa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "panel", "tags": [], "tree": false, @@ -36017,7 +36017,7 @@ } ], "collapsible": false, - "id": "eof794000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -36238,75 +36238,7 @@ "size": "md", "width": 4, "offset": 0, - "components": [ - { - "key": "simplecontentthreeseven", - "html": "

Apply professional society stamp 

 

 

 

 

 

 

(if applicable)

", - "type": "content", - "input": false, - "label": "Text/Images", - "tableView": false, - "hideOnChildrenHidden": false, - "placeholder": "", - "prefix": "", - "customClass": "", - "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, - "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", - "hideLabel": false, - "tabindex": "", - "disabled": false, - "autofocus": false, - "dbIndex": false, - "customDefaultValue": "", - "calculateValue": "", - "calculateServer": false, - "widget": null, - "attributes": {}, - "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, - "conditional": { - "show": null, - "when": null, - "eq": "" - }, - "overlay": { - "style": "", - "left": "", - "top": "", - "width": "", - "height": "" - }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, - "addons": [], - "id": "eltmx7" - } - ], + "components": [], "currentWidth": 4 }, { From 1595b394b7102b709403e0ecb9229ea3839af69c Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Tue, 31 Oct 2023 15:48:08 -0700 Subject: [PATCH 13/35] fixed cssa-mgr notes vibility issue --- ...tification of Independent Remediation.json | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json index e79072a5..4bbaec65 100644 --- a/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json +++ b/forms-flow-ai/epd-forms/bundling/Notification of Independent Remediation.json @@ -443,7 +443,7 @@ "templates": { "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", - "row": "\r\n\r\n{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% console.log('rendering edit grid body')%}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n\r\n\r\n\r\n
\r\n\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% console.log(\"row-key\",component.key,row[component.key]) %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n{% if(component.key == 'comments') { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{% } else { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{%}%}\r\n \r\n\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n \r\n {% } %}\r\n {% } %}\r\n
\r\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% console.log('for sia') %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } %} \r\n \r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n {% } %}\r\n
\r\n {% } %}\r\n \r\n \r\n \r\n{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", + "row": "\n\n{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% console.log('rendering edit grid body')%}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n\n\n\n
\n\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% console.log(\"row-key\",component.key,row[component.key]) %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n{% if(component.key == 'comments') { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{% } else { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{%}%}\n \n\n {% } %}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n \n {% } %}\n {% } %}\n
\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/cssa-manager\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\n
\n {% util.eachComponent(components, function(component) { %}\n {% console.log('for sia') %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ getView(component, row[component.key])}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ getView(component, row[component.key])}}
\n{% } else { %}\n
{{ getView(component, row[component.key])}}
\n{% } %} \n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n {% } %}\n
\n {% } %}\n \n \n \n{% const emptyElements = []; %}\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\n{% for (let i = 0; i < elements.length; i++) { %}\n{% const element = elements[i]; %}\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", "footer": "{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{%if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}\r\n" }, @@ -588,7 +588,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "eg5nycl" + "id": "ex1e4u" } ], "width": 4, @@ -680,7 +680,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "eemn8j" + "id": "ekd68k" } ], "width": 2, @@ -767,7 +767,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ekujf" + "id": "e3ncm9r" } ], "size": "md", @@ -854,7 +854,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ejtmegx" + "id": "eylboa" } ], "size": "md", @@ -941,7 +941,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e92ykyh" + "id": "ejbifaj" } ], "size": "md", @@ -1016,7 +1016,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "eq9y9ki" + "id": "eplwoo" } ], "placeholder": "", @@ -1035,7 +1035,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "e49d927" + "id": "e1a3j4p" }, { "id": "ecf3gbp", @@ -9078,7 +9078,7 @@ "attributes": {}, "components": [ { - "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "epivnsp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -9155,7 +9155,7 @@ "truncateMultipleSpaces": false }, { - "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "el3hlvr00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -9900,7 +9900,7 @@ "attributes": {}, "components": [ { - "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esedw400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -9977,7 +9977,7 @@ "truncateMultipleSpaces": false }, { - "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esor90600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -10719,7 +10719,7 @@ "attributes": {}, "components": [ { - "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ej0y4100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -10796,7 +10796,7 @@ "truncateMultipleSpaces": false }, { - "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e8qg9fh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", @@ -11544,7 +11544,7 @@ "attributes": {}, "components": [ { - "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eevqmo90000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "contaminant", "mask": false, "type": "textfield", @@ -11621,7 +11621,7 @@ "truncateMultipleSpaces": false }, { - "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "et223l30000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "maximumConcentration", "mask": false, "type": "textfield", From 62361ad31045a6ba7a7573f41b1089a35b733021 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Wed, 1 Nov 2023 12:34:14 -0700 Subject: [PATCH 14/35] rename build files --- .../etl/{debezium-jdbc-build.yaml => debezium-jdbc.build.yaml} | 0 .../{debezium-postgis-build.yaml => debezium-postgis.build.yaml} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename openshift/templates/etl/{debezium-jdbc-build.yaml => debezium-jdbc.build.yaml} (100%) rename openshift/templates/etl/{debezium-postgis-build.yaml => debezium-postgis.build.yaml} (100%) diff --git a/openshift/templates/etl/debezium-jdbc-build.yaml b/openshift/templates/etl/debezium-jdbc.build.yaml similarity index 100% rename from openshift/templates/etl/debezium-jdbc-build.yaml rename to openshift/templates/etl/debezium-jdbc.build.yaml diff --git a/openshift/templates/etl/debezium-postgis-build.yaml b/openshift/templates/etl/debezium-postgis.build.yaml similarity index 100% rename from openshift/templates/etl/debezium-postgis-build.yaml rename to openshift/templates/etl/debezium-postgis.build.yaml From fb9589b6f7fc37f74e70d9490987501d057f860a Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Wed, 1 Nov 2023 12:35:03 -0700 Subject: [PATCH 15/35] deploy files for kafka and zookeeper --- .../templates/etl/debezium-kafka.deploy.yaml | 130 +++++++++++++++++ .../etl/debezium-zookeeper.deploy.yaml | 131 ++++++++++++++++++ 2 files changed, 261 insertions(+) create mode 100644 openshift/templates/etl/debezium-kafka.deploy.yaml create mode 100644 openshift/templates/etl/debezium-zookeeper.deploy.yaml diff --git a/openshift/templates/etl/debezium-kafka.deploy.yaml b/openshift/templates/etl/debezium-kafka.deploy.yaml new file mode 100644 index 00000000..7bef3657 --- /dev/null +++ b/openshift/templates/etl/debezium-kafka.deploy.yaml @@ -0,0 +1,130 @@ +--- +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + annotations: + description: Deployment template for Apache Kafka. + tags: "${API_NAME}" + name: "${API_NAME}-deploy" +objects: +- kind: DeploymentConfig + apiVersion: apps.openshift.io/v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + strategy: + type: Rolling + rollingParams: + updatePeriodSeconds: 1 + intervalSeconds: 1 + timeoutSeconds: 600 + maxUnavailable: 25% + maxSurge: 25% + triggers: + - type: ConfigChange + replicas: 1 + test: false + selector: + app: "${API_NAME}" + deploymentconfig: "${API_NAME}" + template: + metadata: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + deploymentconfig: "${API_NAME}" + template: "${API_NAME}-deploy" + role: api + spec: + containers: + - name: "${API_NAME}" + image: debezium/kafka:1.9 + imagePullPolicy: Always + ports: + - containerPort: 9092 + protocol: TCP + env: + - name: ZOOKEEPER_CONNECT + value: debezium-zookeeper:2181 + resources: + requests: + cpu: "50m" + memory: "250Mi" + limits: + cpu: "150m" + memory: "500Mi" + terminationMessagePath: "/dev/termination-log" + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler +- kind: Service + apiVersion: v1 + metadata: + name: "${API_NAME}" + creationTimestamp: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + ports: + - name: 9092-tcp + protocol: TCP + port: 9092 + targetPort: 9092 + selector: + deploymentconfig: "${API_NAME}" + type: ClusterIP + sessionAffinity: None + # status: + # loadBalancer: {} +- kind: Route + apiVersion: v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + to: + kind: Service + name: "${API_NAME}" + weight: 100 + port: + targetPort: 9092-tcp + tls: + termination: edge + wildcardPolicy: None + host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" +parameters: +- name: API_NAME + displayName: Name + description: The name assigned to all of the OpenShift resources associated to the + server instance. + required: true + value: debezium-kafka +- name: APP_GROUP + displayName: App Group + description: The name assigned to all of the deployments in this project. + required: true + value: epd +- name: IMAGE_NAMESPACE + displayName: Image Namespace + required: true + description: The namespace of the OpenShift project containing the imagestream for + the application. + value: c6a6e5-tools +- name: TAG_NAME + displayName: Environment TAG name + description: The TAG name for this environment, e.g., dev, test, prod + required: true + value: dev \ No newline at end of file diff --git a/openshift/templates/etl/debezium-zookeeper.deploy.yaml b/openshift/templates/etl/debezium-zookeeper.deploy.yaml new file mode 100644 index 00000000..9d4bb609 --- /dev/null +++ b/openshift/templates/etl/debezium-zookeeper.deploy.yaml @@ -0,0 +1,131 @@ +--- +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + annotations: + description: Deployment template for Zookeeper. + tags: "${API_NAME}" + name: "${API_NAME}-deploy" +objects: +- kind: DeploymentConfig + apiVersion: apps.openshift.io/v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + strategy: + type: Rolling + rollingParams: + updatePeriodSeconds: 1 + intervalSeconds: 1 + timeoutSeconds: 600 + maxUnavailable: 25% + maxSurge: 25% + triggers: + - type: ConfigChange + replicas: 1 + test: false + selector: + app: "${API_NAME}" + deploymentconfig: "${API_NAME}" + template: + metadata: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + deploymentconfig: "${API_NAME}" + template: "${API_NAME}-deploy" + role: api + spec: + containers: + - name: "${API_NAME}" + image: debezium/zookeeper:1.9 + imagePullPolicy: Always + ports: + - containerPort: 2181 + protocol: TCP + - containerPort: 2888 + protocol: TCP + - containerPort: 3888 + protocol: TCP + resources: + requests: + cpu: "50m" + memory: "250Mi" + limits: + cpu: "150m" + memory: "500Mi" + terminationMessagePath: "/dev/termination-log" + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler +- kind: Service + apiVersion: v1 + metadata: + name: "${API_NAME}" + creationTimestamp: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + ports: + - name: 2181-tcp + protocol: TCP + port: 2181 + targetPort: 2181 + selector: + deploymentconfig: "${API_NAME}" + type: ClusterIP + sessionAffinity: None + # status: + # loadBalancer: {} +- kind: Route + apiVersion: v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + to: + kind: Service + name: "${API_NAME}" + weight: 100 + port: + targetPort: 2181-tcp + tls: + termination: edge + wildcardPolicy: None + host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" +parameters: +- name: API_NAME + displayName: Name + description: The name assigned to all of the OpenShift resources associated to the + server instance. + required: true + value: debezium-zookeeper +- name: APP_GROUP + displayName: App Group + description: The name assigned to all of the deployments in this project. + required: true + value: epd +- name: IMAGE_NAMESPACE + displayName: Image Namespace + required: true + description: The namespace of the OpenShift project containing the imagestream for + the application. + value: c6a6e5-tools +- name: TAG_NAME + displayName: Environment TAG name + description: The TAG name for this environment, e.g., dev, test, prod + required: true + value: dev \ No newline at end of file From f337b26b75a13374ffc2903333d48a9d0470eb5e Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Wed, 1 Nov 2023 23:24:11 -0700 Subject: [PATCH 16/35] deploy config for postgis --- .../etl/debezium-postgis.deploy.yaml | 143 ++++++++++++++++++ 1 file changed, 143 insertions(+) create mode 100644 openshift/templates/etl/debezium-postgis.deploy.yaml diff --git a/openshift/templates/etl/debezium-postgis.deploy.yaml b/openshift/templates/etl/debezium-postgis.deploy.yaml new file mode 100644 index 00000000..6c5fa2c2 --- /dev/null +++ b/openshift/templates/etl/debezium-postgis.deploy.yaml @@ -0,0 +1,143 @@ +--- +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + annotations: + description: Deployment template for PostGis database with Debezium plugins. + tags: "${API_NAME}" + name: "${API_NAME}-deploy" +objects: +- kind: DeploymentConfig + apiVersion: apps.openshift.io/v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + strategy: + type: Rolling + rollingParams: + updatePeriodSeconds: 1 + intervalSeconds: 1 + timeoutSeconds: 600 + maxUnavailable: 25% + maxSurge: 25% + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - "${API_NAME}" + from: + kind: ImageStreamTag + namespace: "${IMAGE_NAMESPACE}" + name: "${API_NAME}:${TAG_NAME}" + replicas: 1 + test: false + selector: + app: "${API_NAME}" + deploymentconfig: "${API_NAME}" + template: + metadata: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + deploymentconfig: "${API_NAME}" + template: "${API_NAME}-deploy" + role: api + spec: + containers: + - name: "${API_NAME}" + image: "${API_NAME}" + imagePullPolicy: Always + ports: + - containerPort: 9092 + protocol: TCP + env: + - name: POSTGRES_USER + value: postgres + - name: POSTGRES_PASSWORD + value: postgres + - name: POSTGRES_DB + value: postgres + resources: + requests: + cpu: "50m" + memory: "250Mi" + limits: + cpu: "150m" + memory: "500Mi" + terminationMessagePath: "/dev/termination-log" + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler +- kind: Service + apiVersion: v1 + metadata: + name: "${API_NAME}" + creationTimestamp: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + ports: + - name: 7432-tcp + protocol: TCP + port: 5432 + targetPort: 7432 + selector: + deploymentconfig: "${API_NAME}" + type: ClusterIP + sessionAffinity: None + # status: + # loadBalancer: {} +- kind: Route + apiVersion: v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + to: + kind: Service + name: "${API_NAME}" + weight: 100 + port: + targetPort: 7432-tcp + tls: + termination: edge + wildcardPolicy: None + host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" +parameters: +- name: API_NAME + displayName: Name + description: The name assigned to all of the OpenShift resources associated to the + server instance. + required: true + value: debezium-postgis +- name: APP_GROUP + displayName: App Group + description: The name assigned to all of the deployments in this project. + required: true + value: epd +- name: IMAGE_NAMESPACE + displayName: Image Namespace + required: true + description: The namespace of the OpenShift project containing the imagestream for + the application. + value: c6a6e5-tools +- name: TAG_NAME + displayName: Environment TAG name + description: The TAG name for this environment, e.g., dev, test, prod + required: true + value: latest \ No newline at end of file From 0fcb48d783c71bcdca1615a47b83b3d8157fc477 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Wed, 1 Nov 2023 23:55:50 -0700 Subject: [PATCH 17/35] deploy config for oracle jdbc --- .../templates/etl/debezium-jdbc.deploy.yaml | 151 ++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 openshift/templates/etl/debezium-jdbc.deploy.yaml diff --git a/openshift/templates/etl/debezium-jdbc.deploy.yaml b/openshift/templates/etl/debezium-jdbc.deploy.yaml new file mode 100644 index 00000000..8cfba074 --- /dev/null +++ b/openshift/templates/etl/debezium-jdbc.deploy.yaml @@ -0,0 +1,151 @@ +--- +kind: Template +apiVersion: template.openshift.io/v1 +metadata: + annotations: + description: Deployment template for Debezium JDBC Connector. + tags: "${API_NAME}" + name: "${API_NAME}-deploy" +objects: +- kind: DeploymentConfig + apiVersion: apps.openshift.io/v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + strategy: + type: Rolling + rollingParams: + updatePeriodSeconds: 1 + intervalSeconds: 1 + timeoutSeconds: 600 + maxUnavailable: 25% + maxSurge: 25% + triggers: + - type: ConfigChange + - type: ImageChange + imageChangeParams: + automatic: true + containerNames: + - "${API_NAME}" + from: + kind: ImageStreamTag + namespace: "${IMAGE_NAMESPACE}" + name: "${API_NAME}:${TAG_NAME}" + replicas: 1 + test: false + selector: + app: "${API_NAME}" + deploymentconfig: "${API_NAME}" + template: + metadata: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + deploymentconfig: "${API_NAME}" + template: "${API_NAME}-deploy" + role: api + spec: + containers: + - name: "${API_NAME}" + image: "${API_NAME}" + imagePullPolicy: Always + ports: + - containerPort: 9092 + protocol: TCP + env: + - name: BOOTSTRAP_SERVERS + value: "kafka:9092" + - name: GROUP_ID + value: "1" + - name: CONFIG_STORAGE_TOPIC + value: "epd_connect_configs" + - name: OFFSET_STORAGE_TOPIC + value: "epd_connect_offsets" + - name: STATUS_STORAGE_TOPIC + value: "epd_connect_statuses" + - name: KAFKA_DEBUG + value: "true" + - name: DEBUG_SUSPEND_FLAG + value: "n" + resources: + requests: + cpu: "50m" + memory: "250Mi" + limits: + cpu: "150m" + memory: "500Mi" + terminationMessagePath: "/dev/termination-log" + terminationMessagePolicy: File + imagePullPolicy: Always + restartPolicy: Always + terminationGracePeriodSeconds: 30 + dnsPolicy: ClusterFirst + securityContext: {} + schedulerName: default-scheduler +- kind: Service + apiVersion: v1 + metadata: + name: "${API_NAME}" + creationTimestamp: + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + ports: + - name: 8083-tcp + protocol: TCP + port: 8083 + targetPort: 8083 + selector: + deploymentconfig: "${API_NAME}" + type: ClusterIP + sessionAffinity: None + # status: + # loadBalancer: {} +- kind: Route + apiVersion: v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + app-group: "${APP_GROUP}" + template: "${API_NAME}-deploy" + spec: + to: + kind: Service + name: "${API_NAME}" + weight: 100 + port: + targetPort: 8083-tcp + tls: + termination: edge + wildcardPolicy: None + host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" +parameters: +- name: API_NAME + displayName: Name + description: The name assigned to all of the OpenShift resources associated to the + server instance. + required: true + value: debezium-jdbc +- name: APP_GROUP + displayName: App Group + description: The name assigned to all of the deployments in this project. + required: true + value: epd +- name: IMAGE_NAMESPACE + displayName: Image Namespace + required: true + description: The namespace of the OpenShift project containing the imagestream for + the application. + value: c6a6e5-tools +- name: TAG_NAME + displayName: Environment TAG name + description: The TAG name for this environment, e.g., dev, test, prod + required: true + value: latest \ No newline at end of file From c5ecfcc37a7d75d62d1bd82c4cca4124ca6a7710 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Thu, 2 Nov 2023 09:10:05 -0700 Subject: [PATCH 18/35] visibility column fix for srcr form --- .../Site Risk Classification Report.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json index 5c538fa8..5a92fac7 100644 --- a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json +++ b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json @@ -2047,7 +2047,7 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n\r\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% if(component.label === 'Notes') { %}\r\n
{{ t(component.label) }}
\r\n {% } else if(component.key !== 'comments') { %}\r\n
{{ t(component.label) }}
\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } else { %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component)) { %}\r\n \r\n {% if(component.key == 'comments') { %}\r\n
{{ t(component.label)}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ t(component.label)}}
\r\n{% } else { %}\r\n
{{ t(component.label)}}
\r\n{% } %} \r\n\r\n \r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } %}\r\n\r\n\r\n\r\n\r\n", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n \n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n\n \n {% } %}\n {% }) %}\n
\n\n{% } %}", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", "row": "{% console.log(\"row-key main srcr\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% console.log('rendering edit grid body')%}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n\r\n\r\n\r\n
\r\n\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% console.log(\"row-key\",component.key,row[component.key]) %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n{% if(component.key == 'comments') { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{% } else { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{%}%}\r\n \r\n\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n \r\n {% } %}\r\n {% } %}\r\n
\r\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-risk-classification-officer\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-manager\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% console.log('for sia') %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } %} \r\n \r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n {% } %}\r\n
\r\n {% } %}\r\n \r\n \r\n \r\n{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", @@ -2194,7 +2194,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "ey1gq4r" + "id": "emqkff9" } ], "width": 4, @@ -2286,7 +2286,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "e9bcg9g" + "id": "e6fpgbb" } ], "width": 2, @@ -2373,7 +2373,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "epglnlb" + "id": "epef9wl" } ], "size": "md", @@ -2460,7 +2460,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "eeowpjq" + "id": "eh7dia" } ], "size": "md", @@ -2547,7 +2547,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "elq91z" + "id": "ejuu0r" } ], "size": "md", @@ -2622,7 +2622,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "elyerv7" + "id": "e6aewb" } ], "placeholder": "", @@ -2641,7 +2641,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "ek52ur9" + "id": "e2kbdyi" }, { "title": "Collection Notice", @@ -5069,7 +5069,7 @@ "attributes": {}, "components": [ { - "id": "ele95t000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ele95t000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "spropertyOwnerAndOrOperator", "tree": false, "type": "panel", @@ -14481,7 +14481,7 @@ "attributes": {}, "components": [ { - "id": "eks0gu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eks0gu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "exposurePathwayQuestionnaireAffectedParcel", "tree": false, "type": "panel", @@ -18424,7 +18424,7 @@ } ], "collapsible": false, - "id": "eo5mwyp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eo5mwyp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", From 73e3cc5608de50df0dadcbb206e1d024e6b83dc5 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Thu, 2 Nov 2023 13:54:46 -0700 Subject: [PATCH 19/35] Email fix in SRCR individual form --- .../processes/SRCR/SRCRWorkflow.bpmn | 959 +++++++++--------- 1 file changed, 473 insertions(+), 486 deletions(-) diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn index 2a64bed9..0520258c 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn @@ -1,5 +1,5 @@ - + @@ -8,7 +8,6 @@ Activity_08fgjgt Gateway_132oe4w - Gateway_1epcelq Gateway_1kotdsu @@ -19,7 +18,6 @@ Activity_06nypz0 Gateway_1osruh3 - Gateway_05aj26w Gateway_1nljcfc @@ -75,10 +73,33 @@ var ownerEmail = execution.getVariable('owneremail'); system.out.println ("ownerEmail "+ownerEmail); execution.setVariable('ownerEmail',ownerEmail); -var emailsToArray = []; -emailsToArray.push(agentEmail); -execution.setVariable("emailTo", Java.to(emailsToArray, "java.lang.Object[]")); -system.out.println ("emailTo"+execution.getVariable('emailTo')); + +system.out.println("dataGrid simple"+ dataGridone); +system.out.println("dataGrid exe"+ execution.getVariable('dataGridone')); + +var dataGridObject = null; + +dataGridObject = JSON.parse(dataGridone); + + +var listOwnerEmailAddress = []; + +for(i in dataGridObject) +{ + if(dataGridObject[i] !== null && dataGridObject[i] != undefined ) + { + var ownerEmailAddress = dataGridObject[i].simpleemail; + if(ownerEmailAddress !== '') + { + listOwnerEmailAddress.push(ownerEmailAddress) + } + } +} + +if(listOwnerEmailAddress.length > 0) +{ + execution.setVariable("emailTo", Java.to(listOwnerEmailAddress, "java.lang.Object[]")); +} execution.setVariable('name','User'); @@ -94,7 +115,12 @@ if (triggers == 'ministryServiceApplicationWithTheRecommendationOfAnApprovedProf execution.setVariable('isSentFromSociety',true); } else { execution.setVariable('isSentFromSociety',false); -} +} + + +execution.setVariable('EmailType','nom'); + +execution.setVariable('formName','Site Risk Classification Report'); Flow_0xiuxfc @@ -127,7 +153,7 @@ execution.setVariable('isSdm',false); task.execution.setVariable('applicationStatus', task.execution.getVariable('action')); - +task.execution.setVariable('userRole','CSAP'); @@ -142,15 +168,10 @@ execution.setVariable('isSdm',false); Flow_159m7j9 - Flow_0lds37b + Flow_159m7j9 Flow_0iim75v Flow_0glptri - - Flow_159m7j9 - Flow_0lds37b - Flow_1js7p0u - @@ -159,7 +180,7 @@ execution.setVariable('isSdm',false); task.execution.setVariable('applicationStatus', task.execution.getVariable('action')); - +task.execution.setVariable('userRole','CSAP Society'); @@ -174,16 +195,11 @@ execution.setVariable('isSdm',false); Flow_1pghhuh - Flow_1vlzzd5 + Flow_1pghhuh Flow_11adl9o Flow_0y1l5de Flow_0err7mx - - Flow_1pghhuh - Flow_1vlzzd5 - Flow_10q9o6e - Flow_13r7dqy Flow_1igr7br @@ -199,7 +215,7 @@ execution.setVariable('isSdm',false); task.execution.setVariable('applicationStatus', task.execution.getVariable('action')); - +task.execution.setVariable('userRole','CSSA Team'); @@ -227,8 +243,6 @@ execution.setVariable('isSdm',false); srcr_updated - Flow_1js7p0u - Flow_10q9o6e Flow_1d8a6i9 Flow_1s9sm8u Flow_1gnzs70 @@ -357,8 +371,7 @@ execution.setVariable('isSrco',false); ${action == 'Recheck'} - - + @@ -375,12 +388,10 @@ execution.setVariable('isSdm',false); ${action == 'Accepted'} - ${action == 'Recheck'} - - + @@ -397,7 +408,6 @@ execution.setVariable('isSdm',false); ${action == 'Accepted'} - @@ -493,7 +503,7 @@ execution.setVariable('isSdm',false); task.execution.setVariable('applicationStatus', task.execution.getVariable('action')); - +task.execution.setVariable('userRole','Statutory Decision Maker'); @@ -552,7 +562,7 @@ execution.setVariable('isSdm',false); task.execution.setVariable('applicationStatus', task.execution.getVariable('action')); - +task.execution.setVariable('userRole','Case Worker'); @@ -598,6 +608,7 @@ execution.setVariable('isSdm',false); task.execution.setVariable('applicationStatus', task.execution.getVariable('action')); +task.execution.setVariable('userRole','Site Risk Classification Officer'); @@ -699,6 +710,20 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); + + + + + + + + + + + + + + @@ -713,288 +738,286 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - + + + + - + - - - + + + + + + + + + + + + - + - - - - - - - - - - + + + + + - + - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + - + - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + - + - - - + + + + + - + - - - - - - - - - - - - - - + + + + - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - + + + - + - - - - - - - - - + + + - + - - - - - - - - + + + - - - - + + + - + - - - - - + + + + - + - - - + + + + + + + + + - + - - - + + + - + - - - - - + + + + - + - - - + + + - - - + + + + + + + + - - - + + + - + - - - - - + + - + - - + + @@ -1002,305 +1025,269 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); - + - - + + - + - - - - - - - - - - - + - + - - - + + + - - - + + + - - - - - - - + + + - - - + + + + + - + - - - - - - - - - - + + + - + - - - - - - - - - - - - + + + - + - - - + + + + + - + - - - - + + + + + + + - - - + + + + + + + + - - - + + + - + - - - + + + + + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - - - - - - - - - - - + + - + - - - - - + + + + + + + - + - - - - - - + + + - + - - - - - - + + + + + + + + + + - + - - - - - - - - - - + + + + + + + - + - - - - - - + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + - + - - - - - - + + + - + - - - - - - - - - - - - - + + + + + + - + - - - - + + + + + + + + + + - + - - - - - - - - - - - - + + + - + - - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + From 04325a99145ccdb9962fd3f506a60b472ff7ba4b Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Fri, 3 Nov 2023 09:29:54 -0700 Subject: [PATCH 20/35] fixed notes visible for site-owner in sir --- .../Site Information Request Application.json | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/forms-flow-ai/epd-forms/Site Information Request Application.json b/forms-flow-ai/epd-forms/Site Information Request Application.json index 8d6b2221..682e5706 100644 --- a/forms-flow-ai/epd-forms/Site Information Request Application.json +++ b/forms-flow-ai/epd-forms/Site Information Request Application.json @@ -451,7 +451,7 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n\r\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor-society\")){ %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% if(component.label === 'Notes') { %}\r\n
{{ t(component.label) }}
\r\n {% } else if(component.key !== 'comments') { %}\r\n
{{ t(component.label) }}
\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } else { %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ t(component.label)}}
\r\n{% } else { %}\r\n
{{ t(component.label)}}
\r\n{% } %} \r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } %}\r\n", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n {% } %}\n {% }) %}\n
\n\n{% } %}\n", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", "row": "{% console.log(\"row-key main\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% console.log('rendering edit grid body')%}\r\n{% if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor-society\")) && row['commentFor']==='external'){ %}\r\n\r\n\r\n\r\n
\r\n\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% console.log(\"row-key\",component.key,row[component.key]) %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor-society\")) && row['commentFor']==='external'){ %}\r\n{% if(component.key == 'comments') { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{% } else { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{%}%}\r\n \r\n\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor-society\")) && row['commentFor']==='external'){ %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n \r\n {% } %}\r\n {% } %}\r\n
\r\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/site-risk-classification-officer\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% console.log('for sia') %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } %} \r\n \r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n {% } %}\r\n
\r\n {% } %}\r\n \r\n \r\n \r\n{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", @@ -477,7 +477,7 @@ "validate": { "required": false, "customMessage": "", - "custom": "const emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\nconsole.log('in validation remove');\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n\r\n\r\nvar b =JSON.parse(localStorage.getItem('UserDetails'))\r\nconsole.log(\"from validation tab\")\r\nif(b.groups.includes(\"/formsflow/formsflow-client\"))\r\n{\r\nvar q = document.querySelector(\"[ref='editgrid-notes-addRow']\");\r\nif(q && q !== null){\r\n console.log(\"inside validation remove\")\r\n q.remove();\r\n}\r\nvar editButtons = document.querySelectorAll('button.btn.btn-default.btn-light.btn-sm.editRow');\r\nfor(i=0;ix.commentFor==='external').length > 0)\r\nshow = true;\r\nelse\r\nshow = false;\r\n}\r\nelse\r\n{\r\n show = true;\r\n}\r\n\r\nif(UserDetails){\r\nvar addRowButton = document.querySelector(\"button[ref=editgrid-notes-addRow]\");\r\nif(addRowButton !==null)\r\n{\r\nif( groups.includes(\"/formsflow/formsflow-client\")){\r\n addRowButton.remove();\r\n}\r\n\r\nconst emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\nconsole.log('in validation remove');\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n}\r\n}\r\n", + "customConditional": "show = false;\nconsole.log('cb');\nconst UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\nconst groups = UserDetails?UserDetails[\"groups\"]:[];\nif(!UserDetails){\n show = false;\n}\nelse if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") ))\n{\nif(data.notes && data.notes.filter((x)=>x.commentFor==='external').length > 0)\nshow = true;\nelse\nshow = false;\n}\nelse\n{\n show = true;\n}\n\nif(UserDetails){\nvar addRowButton = document.querySelector(\"button[ref=editgrid-notes-addRow]\");\nif(addRowButton !==null)\n{\nif( groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") ){\n addRowButton.remove();\n}\n\nconst emptyElements = [];\nconst elements = document.getElementsByClassName(\"list-group-item\");\nfor (let i = 0; i < elements.length; i++) {\nconst element = elements[i];\nconsole.log('in validation remove');\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\n \n}\n}\n}\n\n\nconst emptyElements = [];\nconst elements = document.getElementsByClassName(\"list-group-item\");\nfor (let i = 0; i < elements.length; i++) {\nconst element = elements[i];\nconsole.log('in validation remove');\nif(element.querySelectorAll('div.row').length===0){(element).remove() }} \n", "logic": [], "attributes": {}, "overlay": { @@ -598,7 +598,7 @@ "wysiwyg": false, "editor": "", "fixedSize": true, - "id": "ebf4lsny" + "id": "eov3xma" } ], "width": 4, @@ -690,7 +690,7 @@ "addons": [], "inputType": "radio", "fieldSet": false, - "id": "ebv75w4" + "id": "evbnqlo" } ], "width": 2, @@ -777,7 +777,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "etbehkh" + "id": "eog1cy" } ], "size": "md", @@ -864,7 +864,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ew65mqf" + "id": "ev2c1sr" } ], "size": "md", @@ -951,7 +951,7 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "ehngju" + "id": "e52p82" } ], "size": "md", @@ -1026,7 +1026,7 @@ "tree": false, "lazyLoad": false, "autoAdjust": false, - "id": "ecge8nk" + "id": "etxqyzk" } ], "placeholder": "", @@ -1045,7 +1045,7 @@ "tree": true, "lazyLoad": false, "defaultOpen": false, - "id": "ephg3lb" + "id": "er8w6ss" }, { "id": "et4x1z", @@ -5670,7 +5670,7 @@ "attributes": {}, "components": [ { - "id": "ecmzjdn00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ecmzjdn00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "panel", "tree": false, "type": "panel", From 8961aeefe45cc4a109382f849e46dec5861d2745 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Fri, 3 Nov 2023 10:06:58 -0700 Subject: [PATCH 21/35] fixed notes section for cssa manager --- .../Site Risk Classification Report.json | 460 ++++++++++-------- 1 file changed, 245 insertions(+), 215 deletions(-) diff --git a/forms-flow-ai/epd-forms/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/Site Risk Classification Report.json index e68004f8..0cce1569 100644 --- a/forms-flow-ai/epd-forms/Site Risk Classification Report.json +++ b/forms-flow-ai/epd-forms/Site Risk Classification Report.json @@ -635,10 +635,31 @@ "components": [ { "label": "Select SDM", + "labelPosition": "top", "widget": "choicesjs", + "placeholder": "", + "description": "", + "tooltip": "", + "customClass": "", + "tabindex": "", + "hidden": false, + "hideLabel": false, + "uniqueOptions": false, + "autofocus": false, + "disabled": false, "tableView": true, + "modalEdit": false, + "multiple": false, "dataSrc": "url", "data": { + "values": [ + { + "label": "", + "value": "" + } + ], + "resource": "", + "json": "", "url": "{{localStorage.getItem('formsflow.ai.api.url')}}/user?memberOfGroup=formsflow/formsflow-reviewer/sdm", "headers": [ { @@ -654,107 +675,96 @@ "value": "application/json" } ], - "values": [ - { - "label": "", - "value": "" - } - ], - "json": "", - "resource": "", "custom": "" }, "dataType": "string", + "idPath": "id", "valueProperty": "username", "template": "{{ item.lastName }}, {{ item.firstName }}", + "refreshOn": "", + "refreshOnBlur": "", + "clearOnRefresh": false, + "searchEnabled": true, + "selectThreshold": 0.3, + "readOnlyValue": false, + "customOptions": {}, + "useExactSearch": false, + "persistent": true, + "protected": false, + "dbIndex": false, + "encrypted": false, + "clearOnHide": true, + "customDefaultValue": "", + "calculateValue": "", + "calculateServer": false, + "allowCalculateOverride": false, + "validateOn": "change", "validate": { "required": true, + "onlyAvailableItems": false, + "customMessage": "", "custom": "", "customPrivate": false, + "json": "", "strictDateValidation": false, "multiple": false, - "unique": false, - "onlyAvailableItems": false + "unique": false }, - "key": "selectSdm", - "type": "select", - "selectValues": "data", - "disableLimit": false, - "input": true, - "keyModified": true, - "placeholder": "", - "prefix": "", - "customClass": "", - "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, "unique": false, - "persistent": true, - "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", "errorLabel": "", - "tooltip": "", - "hideLabel": false, - "tabindex": "", - "disabled": false, - "autofocus": false, - "dbIndex": false, - "customDefaultValue": "", - "calculateValue": "", - "calculateServer": false, - "attributes": {}, - "validateOn": "change", + "errors": "", + "key": "selectSdm", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, - "addons": [], - "idPath": "id", - "clearOnRefresh": false, - "limit": 100, + "type": "select", + "indexeddb": { + "filter": {} + }, "lazyLoad": true, - "filter": "", - "searchEnabled": true, - "searchDebounce": 0.3, + "selectValues": "data", + "selectFields": "", + "disableLimit": false, "searchField": "", + "searchDebounce": 0.3, "minSearch": 0, - "readOnlyValue": false, + "filter": "", + "limit": 100, "authenticate": false, "ignoreCache": false, - "selectFields": "", - "selectThreshold": 0.3, - "uniqueOptions": false, + "redrawOn": "", + "input": true, + "keyModified": true, + "prefix": "", + "suffix": "", + "dataGridLabel": false, + "showCharCount": false, + "showWordCount": false, + "allowMultipleMasks": false, + "addons": [], "fuseOptions": { "include": "score", "threshold": 0.3 }, - "indexeddb": { - "filter": {} - }, - "customOptions": {}, - "useExactSearch": false, - "id": "e08q3" + "id": "el5mtlj", + "defaultValue": "", + "sort": "" } ], "width": 4, @@ -768,10 +778,31 @@ "components": [ { "label": "Select Caseworker", + "labelPosition": "top", "widget": "choicesjs", + "placeholder": "", + "description": "", + "tooltip": "", + "customClass": "", + "tabindex": "", + "hidden": false, + "hideLabel": false, + "uniqueOptions": false, + "autofocus": false, + "disabled": false, "tableView": true, + "modalEdit": false, + "multiple": false, "dataSrc": "url", "data": { + "values": [ + { + "label": "", + "value": "" + } + ], + "resource": "", + "json": "", "url": "{{localStorage.getItem('formsflow.ai.api.url')}}/user?memberOfGroup=formsflow/formsflow-reviewer/caseworker", "headers": [ { @@ -787,107 +818,96 @@ "value": "application/json" } ], - "values": [ - { - "label": "", - "value": "" - } - ], - "json": "", - "resource": "", "custom": "" }, "dataType": "string", + "idPath": "id", "valueProperty": "username", "template": "{{ item.lastName }}, {{ item.firstName }}", + "refreshOn": "", + "refreshOnBlur": "", + "clearOnRefresh": false, + "searchEnabled": true, + "selectThreshold": 0.3, + "readOnlyValue": false, + "customOptions": {}, + "useExactSearch": false, + "persistent": true, + "protected": false, + "dbIndex": false, + "encrypted": false, + "clearOnHide": true, + "customDefaultValue": "", + "calculateValue": "", + "calculateServer": false, + "allowCalculateOverride": false, + "validateOn": "change", "validate": { "required": true, + "onlyAvailableItems": false, + "customMessage": "", "custom": "", "customPrivate": false, + "json": "", "strictDateValidation": false, "multiple": false, - "unique": false, - "onlyAvailableItems": false + "unique": false }, - "key": "selectCaseworker", - "type": "select", - "selectValues": "data", - "disableLimit": false, - "input": true, - "keyModified": true, - "placeholder": "", - "prefix": "", - "customClass": "", - "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, "unique": false, - "persistent": true, - "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", "errorLabel": "", - "tooltip": "", - "hideLabel": false, - "tabindex": "", - "disabled": false, - "autofocus": false, - "dbIndex": false, - "customDefaultValue": "", - "calculateValue": "", - "calculateServer": false, - "attributes": {}, - "validateOn": "change", + "errors": "", + "key": "selectCaseworker", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, - "addons": [], - "idPath": "id", - "clearOnRefresh": false, - "limit": 100, + "type": "select", + "indexeddb": { + "filter": {} + }, "lazyLoad": true, - "filter": "", - "searchEnabled": true, - "searchDebounce": 0.3, + "selectValues": "data", + "selectFields": "", + "disableLimit": false, "searchField": "", + "searchDebounce": 0.3, "minSearch": 0, - "readOnlyValue": false, + "filter": "", + "limit": 100, "authenticate": false, "ignoreCache": false, - "selectFields": "", - "selectThreshold": 0.3, - "uniqueOptions": false, + "redrawOn": "", + "input": true, + "keyModified": true, + "prefix": "", + "suffix": "", + "dataGridLabel": false, + "showCharCount": false, + "showWordCount": false, + "allowMultipleMasks": false, + "addons": [], "fuseOptions": { "include": "score", "threshold": 0.3 }, - "indexeddb": { - "filter": {} - }, - "customOptions": {}, - "useExactSearch": false, - "id": "ewmgoh" + "id": "ea94sof", + "defaultValue": "", + "sort": "" } ], "width": 4, @@ -901,10 +921,31 @@ "components": [ { "label": "Select SRCO", + "labelPosition": "top", "widget": "choicesjs", + "placeholder": "", + "description": "", + "tooltip": "", + "customClass": "", + "tabindex": "", + "hidden": false, + "hideLabel": false, + "uniqueOptions": false, + "autofocus": false, + "disabled": false, "tableView": true, + "modalEdit": false, + "multiple": false, "dataSrc": "url", "data": { + "values": [ + { + "label": "", + "value": "" + } + ], + "resource": "", + "json": "", "url": "{{localStorage.getItem('formsflow.ai.api.url')}}/user?memberOfGroup=formsflow/formsflow-reviewer/site-risk-classification-officer", "headers": [ { @@ -920,107 +961,96 @@ "value": "application/json" } ], - "values": [ - { - "label": "", - "value": "" - } - ], - "json": "", - "resource": "", "custom": "" }, "dataType": "string", + "idPath": "id", "valueProperty": "username", "template": "{{ item.lastName }}, {{ item.firstName }}", + "refreshOn": "", + "refreshOnBlur": "", + "clearOnRefresh": false, + "searchEnabled": true, + "selectThreshold": 0.3, + "readOnlyValue": false, + "customOptions": {}, + "useExactSearch": false, + "persistent": true, + "protected": false, + "dbIndex": false, + "encrypted": false, + "clearOnHide": true, + "customDefaultValue": "", + "calculateValue": "", + "calculateServer": false, + "allowCalculateOverride": false, + "validateOn": "change", "validate": { "required": true, + "onlyAvailableItems": false, + "customMessage": "", "custom": "", "customPrivate": false, + "json": "", "strictDateValidation": false, "multiple": false, - "unique": false, - "onlyAvailableItems": false + "unique": false }, - "key": "selectSrco", - "type": "select", - "selectValues": "data", - "disableLimit": false, - "input": true, - "keyModified": true, - "placeholder": "", - "prefix": "", - "customClass": "", - "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, "unique": false, - "persistent": true, - "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", "errorLabel": "", - "tooltip": "", - "hideLabel": false, - "tabindex": "", - "disabled": false, - "autofocus": false, - "dbIndex": false, - "customDefaultValue": "", - "calculateValue": "", - "calculateServer": false, - "attributes": {}, - "validateOn": "change", + "errors": "", + "key": "selectSrco", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, - "addons": [], - "idPath": "id", - "clearOnRefresh": false, - "limit": 100, + "type": "select", + "indexeddb": { + "filter": {} + }, "lazyLoad": true, - "filter": "", - "searchEnabled": true, - "searchDebounce": 0.3, + "selectValues": "data", + "selectFields": "", + "disableLimit": false, "searchField": "", + "searchDebounce": 0.3, "minSearch": 0, - "readOnlyValue": false, + "filter": "", + "limit": 100, "authenticate": false, "ignoreCache": false, - "selectFields": "", - "selectThreshold": 0.3, - "uniqueOptions": false, + "redrawOn": "", + "input": true, + "keyModified": true, + "prefix": "", + "suffix": "", + "dataGridLabel": false, + "showCharCount": false, + "showWordCount": false, + "allowMultipleMasks": false, + "addons": [], "fuseOptions": { "include": "score", "threshold": 0.3 }, - "indexeddb": { - "filter": {} - }, - "customOptions": {}, - "useExactSearch": false, - "id": "eq18r4" + "id": "epvp7yj", + "defaultValue": "", + "sort": "" } ], "size": "md", @@ -1156,9 +1186,9 @@ "tableView": false, "modalEdit": false, "templates": { - "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n\r\n{% if(groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% if(component.label === 'Notes') { %}\r\n
{{ t(component.label) }}
\r\n {% } else if(component.key !== 'comments') { %}\r\n
{{ t(component.label) }}
\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } else { %}\r\n\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component)) { %}\r\n \r\n {% if(component.key == 'comments') { %}\r\n
{{ t(component.label)}}
\r\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ t(component.label)}}
\r\n{% } else { %}\r\n
{{ t(component.label)}}
\r\n{% } %} \r\n\r\n \r\n {% } %}\r\n {% }) %}\r\n
\r\n\r\n{% } %}\r\n\r\n\r\n\r\n\r\n", + "header": "{% console.log(\"row-key header\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n\n{% if(groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")){ %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% if(component.label === 'Notes') { %}\n
{{ t(component.label) }}
\n {% } else if(component.key !== 'comments') { %}\n
{{ t(component.label) }}
\n {% } %}\n {% } %}\n {% }) %}\n
\n\n{% } else { %}\n\n
\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component)) { %}\n \n {% if(component.key == 'comments') { %}\n
{{ t(component.label)}}
\n {% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ t(component.label)}}
\n{% } else { %}\n
{{ t(component.label)}}
\n{% } %} \n\n \n {% } %}\n {% }) %}\n
\n\n{% } %}\n\n\n\n\n", "tableHeader": "\n \n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n {{ component.label }}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n Actions\n {% } %}\n \n ", - "row": "{% console.log(\"row-key main srcr\",'commentFor',row['commentFor']) %}\r\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% console.log('rendering edit grid body')%}\r\n{% if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n\r\n\r\n\r\n
\r\n\r\n {% util.eachComponent(components, function(component) { %}\r\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\r\n {% console.log(\"row-key\",component.key,row[component.key]) %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n{% if(component.key == 'comments') { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{% } else { %}\r\n
\r\n {{ getView(component, row[component.key])}}\r\n
\r\n{%}%}\r\n \r\n\r\n {% } %}\r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\r\n{% const groups = UserDetails[\"groups\"]; %}\r\n{% if((groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n \r\n {% } %}\r\n {% } %}\r\n
\r\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-risk-classification-officer\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\r\n
\r\n {% util.eachComponent(components, function(component) { %}\r\n {% console.log('for sia') %}\r\n {% if (displayValue(component)) { %}\r\n {% if(component.key == 'comments') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else if(component.key == 'role' || component.key == 'createdBy') { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } else { %}\r\n
{{ getView(component, row[component.key])}}
\r\n{% } %} \r\n \r\n {% } %}\r\n {% }) %}\r\n {% if (!instance.options.readOnly && !instance.disabled) { %}\r\n
\r\n
\r\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\r\n \r\n {% } %}\r\n
\r\n
\r\n {% } %}\r\n
\r\n {% } %}\r\n \r\n \r\n \r\n{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", + "row": "{% console.log(\"row-key main srcr\",'commentFor',row['commentFor']) %}\n{% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% console.log('rendering edit grid body')%}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n\n\n\n
\n\n {% util.eachComponent(components, function(component) { %}\n {% if (displayValue(component) && component.key !== 'commentFor' ) { %}\n {% console.log(\"row-key\",component.key,row[component.key]) %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n{% if(component.key == 'comments') { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{% } else { %}\n
\n {{ getView(component, row[component.key])}}\n
\n{%}%}\n \n\n {% } %}\n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n {% const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))%}\n{% const groups = UserDetails[\"groups\"]; %}\n{% if((groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") || groups.includes(\"/formsflow/formsflow-client\") || groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\")) && row['commentFor']==='external'){ %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n \n {% } %}\n {% } %}\n
\n {% } else if (groups.includes(\"/formsflow/formsflow-reviewer/cssa-manager\") || groups.includes(\"/formsflow/formsflow-reviewer/site-information-advisor\") || groups.includes(\"/formsflow/formsflow-reviewer/site-risk-classification-officer\") || groups.includes(\"/formsflow/formsflow-reviewer/cssa-team\") || groups.includes(\"/formsflow/formsflow-reviewer/caseworker\") || groups.includes(\"/formsflow/formsflow-reviewer/sdm\")) { %}\n
\n {% util.eachComponent(components, function(component) { %}\n {% console.log('for sia') %}\n {% if (displayValue(component)) { %}\n {% if(component.key == 'comments') { %}\n
{{ getView(component, row[component.key])}}
\n{% } else if(component.key == 'role' || component.key == 'createdBy') { %}\n
{{ getView(component, row[component.key])}}
\n{% } else { %}\n
{{ getView(component, row[component.key])}}
\n{% } %} \n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n
\n
\n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n
\n {% } %}\n
\n {% } %}\n \n \n \n{% const emptyElements = []; %}\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\n{% for (let i = 0; i < elements.length; i++) { %}\n{% const element = elements[i]; %}\n{% if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}", "tableRow": "\n {% util.eachComponent(components, function(component) { %}\n {% if (!component.hasOwnProperty('tableView') || component.tableView) { %}\n \n {{ getView(component, row[component.key]) }}\n \n {% } %}\n {% }) %}\n {% if (!instance.options.readOnly && !instance.disabled) { %}\n \n
\n \n {% if (!instance.hasRemoveButtons || instance.hasRemoveButtons()) { %}\n \n {% } %}\n
\n \n {% } %}\n ", "footer": "{% const emptyElements = []; %}\r\n{% const elements = document.getElementsByClassName(\"list-group-item\"); %}\r\n{% for (let i = 0; i < elements.length; i++) { %}\r\n{% const element = elements[i]; %}\r\n{%if(element.querySelectorAll('div.row').length===0){(element).remove() }} %}\r\n" }, @@ -1182,7 +1212,7 @@ "validate": { "required": false, "customMessage": "", - "custom": "const emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\n\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n\r\n\r\nvar b =JSON.parse(localStorage.getItem('UserDetails'))\r\n\r\nif(b.groups.includes(\"/formsflow/formsflow-client\"))\r\n{\r\n\tif(document.querySelector(\"[ref='editgrid-srcrNotes-addRow']\")!==null)\r\n\t{\r\n\t\tdocument.querySelector(\"[ref='editgrid-srcrNotes-addRow']\").remove();\r\n\t}\r\nvar editButtons = document.querySelectorAll('button.btn.btn-default.btn-light.btn-sm.editRow');\r\nfor(i=0;ix.commentFor==='external').length > 0)\r\nshow = true;\r\nelse\r\nshow = false;\r\n}\r\nelse\r\n{\r\n show = true;\r\n}\r\n\r\nif(UserDetails){\r\nvar addRowButton = document.querySelector(\"button[ref=editgrid-srcrNotes-addRow]\");\r\nif(addRowButton!=null)\r\n{\r\naddRowButton.addEventListener('click',\r\n(e)=>{\r\n\t\tif( groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\r\n\t\t{\r\n\t\t var internalRadio = document.querySelectorAll(\"input[value='internal'][type='radio']\");\r\n\t\t for (let i = 0; i < internalRadio.length; i++) {\r\n\t\t\tif(internalRadio[i].parentElement !== null)\r\n\t\t\t{\r\n\t\t\t\tinternalRadio[i].parentElement.remove();\r\n\t\t\t}\r\n\t\t }\r\n\t\t}\r\n})\r\n\r\nconst emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\n\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n}\r\n\r\n\r\nconst emptyElements = [];\r\nconst elements = document.getElementsByClassName(\"list-group-item\");\r\nfor (let i = 0; i < elements.length; i++) {\r\nconst element = elements[i];\r\n\r\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\r\n \r\n}\r\n\r\n\r\nvar b =JSON.parse(localStorage.getItem('UserDetails'))\r\n\r\nif(b.groups.includes(\"/formsflow/formsflow-client\"))\r\n{\r\n\tif(document.querySelector(\"[ref='editgrid-srcrNotes-addRow']\")!==null)\r\n\t{\r\n\t\tdocument.querySelector(\"[ref='editgrid-srcrNotes-addRow']\").remove();\r\n\t}\r\nvar editButtons = document.querySelectorAll('button.btn.btn-default.btn-light.btn-sm.editRow');\r\nfor(i=0;ix.commentFor==='external').length > 0)\nshow = true;\nelse\nshow = false;\n}\nelse\n{\n show = true;\n}\n\nif(UserDetails){\nvar addRowButton = document.querySelector(\"button[ref=editgrid-srcrNotes-addRow]\");\nif(addRowButton!=null)\n{\naddRowButton.addEventListener('click',\n(e)=>{\n\t\tif( groups.includes(\"/formsflow/formsflow-reviewer/csap\") || groups.includes(\"/formsflow/formsflow-reviewer/csap-society\"))\n\t\t{\n\t\t var internalRadio = document.querySelectorAll(\"input[value='internal'][type='radio']\");\n\t\t for (let i = 0; i < internalRadio.length; i++) {\n\t\t\tif(internalRadio[i].parentElement !== null)\n\t\t\t{\n\t\t\t\tinternalRadio[i].parentElement.remove();\n\t\t\t}\n\t\t }\n\t\t}\n})\n\nconst emptyElements = [];\nconst elements = document.getElementsByClassName(\"list-group-item\");\nfor (let i = 0; i < elements.length; i++) {\nconst element = elements[i];\n\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\n \n}\n}\n\n\nconst emptyElements = [];\nconst elements = document.getElementsByClassName(\"list-group-item\");\nfor (let i = 0; i < elements.length; i++) {\nconst element = elements[i];\n\nif(element.querySelectorAll('div.row').length===0){(element).remove() }\n \n}\n\n\nvar b =JSON.parse(localStorage.getItem('UserDetails'))\n\nif(b.groups.includes(\"/formsflow/formsflow-client\") || b.groups.includes(\"/formsflow/formsflow-reviewer/formsflow-client-reviewer\") )\n{\n\tif(document.querySelector(\"[ref='editgrid-srcrNotes-addRow']\")!==null)\n\t{\n\t\tdocument.querySelector(\"[ref='editgrid-srcrNotes-addRow']\").remove();\n\t}\nvar editButtons = document.querySelectorAll('button.btn.btn-default.btn-light.btn-sm.editRow');\nfor(i=0;i Date: Fri, 3 Nov 2023 15:07:19 -0700 Subject: [PATCH 22/35] removed email after cssa manager action and added proper role in notes section --- .../Site Risk Classification Report.json | 104 ++++++++++-------- .../processes/SRCR/SRCRWorkflow.bpmn | 27 +---- 2 files changed, 60 insertions(+), 71 deletions(-) diff --git a/forms-flow-ai/epd-forms/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/Site Risk Classification Report.json index 0cce1569..78fb6d05 100644 --- a/forms-flow-ai/epd-forms/Site Risk Classification Report.json +++ b/forms-flow-ai/epd-forms/Site Risk Classification Report.json @@ -1439,80 +1439,90 @@ "components": [ { "label": "Role", - "disabled": true, - "tableView": true, - "customDefaultValue": "var b =JSON.parse(localStorage.getItem('UserDetails'))\r\nif(b.groups.indexOf('/formsflow/formsflow-client') > -1 )\r\n{\r\n value = 'Client'\r\n}\r\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/csap') > -1 )\r\n{\r\n value = 'Approved Professional'\r\n}\r\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/csap-society') > -1 )\r\n{\r\n value = 'CSAP Society'\r\n}\r\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/cssa-team') > -1 )\r\n{\r\n value = 'CSSA Team'\r\n}\r\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/caseworker') > -1 )\r\n{\r\n value = 'Caseworker'\r\n}\r\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/sdm') > -1 )\r\n{\r\n value = 'Statutory Decision Maker'\r\n}\r\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/site-risk-classification-officer') > -1 )\r\n{\r\n value = 'Site Risk Classification Officer'\r\n}", - "key": "role", - "type": "textfield", - "input": true, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": true, + "tableView": true, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, + "customDefaultValue": "var b =JSON.parse(localStorage.getItem('UserDetails'))\nif(b.groups.indexOf('/formsflow/formsflow-client') > -1 )\n{\n value = 'Client'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/csap') > -1 )\n{\n value = 'Approved Professional'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/csap-society') > -1 )\n{\n value = 'CSAP Society'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/cssa-team') > -1 )\n{\n value = 'CSSA Team'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/cssa-manager') > -1 )\n{\n value = 'CSSA Manager'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/caseworker') > -1 )\n{\n value = 'Caseworker'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/sdm') > -1 )\n{\n value = 'Statutory Decision Maker'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/site-risk-classification-officer') > -1 )\n{\n value = 'Site Risk Classification Officer'\n}\nelse if(b.groups.indexOf('/formsflow/formsflow-reviewer/site-information-advisor') > -1 )\n{\n value = 'Site Information Advisor'\n}", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", "validate": { "required": false, + "pattern": "", + "customMessage": "", "custom": "", "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, + "json": "", "minLength": "", "maxLength": "", - "pattern": "" + "strictDateValidation": false, + "multiple": false, + "unique": false }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "role", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "elcx7d" + "id": "ezzq7as", + "defaultValue": "" } ], "size": "md", @@ -4208,7 +4218,7 @@ "attributes": {}, "components": [ { - "id": "ele95t00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ele95t0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "spropertyOwnerAndOrOperator", "tree": false, "type": "panel", @@ -13618,7 +13628,7 @@ "attributes": {}, "components": [ { - "id": "eks0gu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eks0gu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "exposurePathwayQuestionnaireAffectedParcel", "tree": false, "type": "panel", @@ -17561,7 +17571,7 @@ } ], "collapsible": false, - "id": "eo5mwyp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eo5mwyp0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn index 0520258c..4662a246 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/SRCR/SRCRWorkflow.bpmn @@ -51,7 +51,6 @@ Activity_1qnqtak Gateway_0mexztf Activity_0m6abz8 - Gateway_0urokjh @@ -247,7 +246,6 @@ task.execution.setVariable('userRole','CSSA Team'); Flow_1s9sm8u Flow_1gnzs70 Flow_0e8b4d4 - Flow_0v5ez8t Flow_1ehxfe5 @@ -485,7 +483,7 @@ execution.setVariable('isSdm',false); ${action == 'Approved' or action == 'Rejected' } - + @@ -671,7 +669,7 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); - Flow_1q9t450 + Flow_0s43gpy Flow_07tic47 Flow_1qaodt0 @@ -695,13 +693,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); Flow_1igr7br Flow_0s43gpy - - - Flow_0s43gpy - Flow_1q9t450 - Flow_0v5ez8t - - @@ -738,15 +729,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); - - - - - - - - - @@ -822,7 +804,7 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); - + @@ -1285,9 +1267,6 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); - - - From dbe5240ba6d598268e31c6436ffc1e1fde2f72e9 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Tue, 7 Nov 2023 11:53:25 -0800 Subject: [PATCH 23/35] execute permission to initdb.d --- etl/debezium-postgis/15-3.3/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/etl/debezium-postgis/15-3.3/Dockerfile b/etl/debezium-postgis/15-3.3/Dockerfile index aad7cfd3..d9f858ba 100644 --- a/etl/debezium-postgis/15-3.3/Dockerfile +++ b/etl/debezium-postgis/15-3.3/Dockerfile @@ -44,4 +44,6 @@ COPY --from=build /usr/share/postgresql/$PG_MAJOR/extension/decoderbufs.control COPY postgresql.conf.sample /usr/share/postgresql/postgresql.conf.sample # Copy the script which will initialize the replication permissions -COPY /docker-entrypoint-initdb.d /docker-entrypoint-initdb.d \ No newline at end of file +COPY /docker-entrypoint-initdb.d/init-permissions.sh /docker-entrypoint-initdb.d/init-permissions.sh + +RUN chmod +x /docker-entrypoint-initdb.d/init-permissions.sh \ No newline at end of file From b948c2c4cae9408560ccdc31e7c7032851394950 Mon Sep 17 00:00:00 2001 From: nikhila-aot Date: Tue, 7 Nov 2023 12:23:46 -0800 Subject: [PATCH 24/35] issue fix for 121 --- ...nated Sites Services Application Form.json | 85 +- ... Ecological Risk Assessment Checklist.json | 8 +- .../Site Risk Classification Report.json | 10 +- .../subProcess/CSSABundleWorklow.bpmn | 1675 ++++++++-------- .../subProcess/DERABundleWorkflow.bpmn | 1682 +++++++++-------- 5 files changed, 1773 insertions(+), 1687 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json index 71f98aa5..37caaac2 100644 --- a/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json +++ b/forms-flow-ai/epd-forms/bundling/Contaminated Sites Services Application Form.json @@ -465,10 +465,41 @@ "action": "custom", "showValidations": false, "theme": "warning", + "size": "md", + "block": false, + "leftIcon": "", + "rightIcon": "", + "shortcut": "", + "description": "", + "tooltip": "", + "customClass": "", + "tabindex": "", + "disableOnInvalid": false, + "hidden": false, + "autofocus": false, "disabled": true, "tableView": false, + "modalEdit": false, "key": "needsMoreInfo", - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (applicationStatus === 'Resubmit') {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "tags": [], + "properties": {}, + "conditional": { + "show": null, + "when": null, + "eq": "", + "json": "" + }, + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n\tvar isResubmitted = response.isSrcrResubmitted ? response.isSrcrResubmitted.value : false;\r\n\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (isResubmitted) {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "logic": [], + "attributes": {}, + "overlay": { + "style": "", + "page": "", + "left": "", + "top": "", + "width": "", + "height": "" + }, "type": "button", "custom": "const submissionId = form._submission._id;\r\nconst formId = form._submission.form;\r\nconst formDataReqUrl = form.formio?form.formio.formUrl:(localStorage.getItem('customSubmissionUrl')+'/form/'+formId)+'/submission/'+submissionId;+submissionId;\r\nconst filteredData = _.pick(data, data.cssaUtilKeys);\r\nconst formDataReqObj1 = { \"_id\": submissionId, \"data\": filteredData};\r\nconst formio = new Formio(formDataReqUrl);\r\nformio.saveSubmission(formDataReqObj1).then( result => {\r\nform.emit('customEvent', {\r\n type: \"actionComplete\", \r\n component: component,\r\n actionType: 'Returned'\r\n }); \r\n}).catch((error)=>{\r\n//Error callback on not Save\r\nform.emit('customEvent', {\r\n type: \"actionError\", \r\n component: component,\r\n actionType:'Returned'\r\n }); \r\n});", "input": true, @@ -476,25 +507,18 @@ "keyModified": true, "placeholder": "", "prefix": "", - "customClass": "", "suffix": "", "multiple": false, "defaultValue": null, "protected": false, "unique": false, "persistent": false, - "hidden": false, "clearOnHide": true, "refreshOn": "", - "modalEdit": false, "dataGridLabel": true, "labelPosition": "top", - "description": "", "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "autofocus": false, "dbIndex": false, "customDefaultValue": "", "calculateValue": "", @@ -502,7 +526,6 @@ "widget": { "type": "input" }, - "attributes": {}, "validateOn": "change", "validate": { "required": false, @@ -512,31 +535,13 @@ "multiple": false, "unique": false }, - "conditional": { - "show": null, - "when": null, - "eq": "" - }, - "overlay": { - "style": "", - "left": "", - "top": "", - "width": "", - "height": "" - }, "allowCalculateOverride": false, "encrypted": false, "showCharCount": false, "showWordCount": false, - "properties": {}, "allowMultipleMasks": false, "addons": [], - "size": "md", - "leftIcon": "", - "rightIcon": "", - "block": false, - "disableOnInvalid": false, - "id": "ewzp0gq" + "id": "e7zbnrio" } ], "size": "md", @@ -7612,7 +7617,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "ehmz9lv" + "id": "ehmz9lv0000" } ], "placeholder": "", @@ -9255,7 +9260,7 @@ } ], "collapsible": false, - "id": "ewhx8sm", + "id": "ewhx8sm0000", "placeholder": "", "prefix": "", "customClass": "", @@ -18423,7 +18428,7 @@ }, "inputMask": "999-999-999", "tableView": true, - "id": "elva88", + "id": "elva880000", "placeholder": "", "prefix": "", "customClass": "", @@ -18503,7 +18508,7 @@ "tableView": true, "autoExpand": true, "inputFormat": "plain", - "id": "ey48nu", + "id": "ey48nu0000", "placeholder": "", "prefix": "", "customClass": "", @@ -18878,7 +18883,7 @@ "input": true, "label": "PIN", "tableView": true, - "id": "eyxe45n", + "id": "eyxe45n0000", "placeholder": "", "prefix": "", "customClass": "", @@ -18971,7 +18976,7 @@ "autoExpand": true, "inputFormat": "plain", "placeholder": "example, metes and bounds", - "id": "efdcvf", + "id": "efdcvf0000", "prefix": "", "customClass": "", "suffix": "", @@ -19185,7 +19190,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "emf4u7g", + "id": "emf4u7g0000", "placeholder": "", "prefix": "", "customClass": "", @@ -20237,7 +20242,7 @@ }, "inputMask": "999-999-999", "tableView": true, - "id": "ev43oe9", + "id": "ev43oe90000", "placeholder": "", "prefix": "", "customClass": "", @@ -20317,7 +20322,7 @@ "tableView": true, "autoExpand": true, "inputFormat": "plain", - "id": "eb3d0l", + "id": "eb3d0l0000", "placeholder": "", "prefix": "", "customClass": "", @@ -20692,7 +20697,7 @@ "input": true, "label": "PIN", "tableView": true, - "id": "eyv4fcu", + "id": "eyv4fcu0000", "placeholder": "", "prefix": "", "customClass": "", @@ -20785,7 +20790,7 @@ "autoExpand": true, "inputFormat": "plain", "placeholder": "example, metes and bounds", - "id": "ecgeub", + "id": "ecgeub0000", "prefix": "", "customClass": "", "suffix": "", @@ -20999,7 +21004,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "eguyyh", + "id": "eguyyh0000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json index 9f22932a..f8a7cea2 100644 --- a/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json +++ b/forms-flow-ai/epd-forms/bundling/Detailed Ecological Risk Assessment Checklist.json @@ -392,7 +392,7 @@ "eq": "", "json": "" }, - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (applicationStatus === 'Resubmit') {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n\t if(roles.includes(\"formsflow-reviewer\")) {\r\n \tvar applicationStatus = response.applicationStatus ? response.applicationStatus.value : '';\r\n\tvar isResubmitted = response.isSrcrResubmitted ? response.isSrcrResubmitted.value : false;\r\n \t show = true;\r\n \t \r\n\r\n \t\t\r\n\t if (isResubmitted) {\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since SRCR resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t }\r\n\t else\r\n\t {\r\n \t\tshow = false;\r\n\t }\r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", "logic": [], "attributes": {}, "overlay": { @@ -444,7 +444,7 @@ "showWordCount": false, "allowMultipleMasks": false, "addons": [], - "id": "ef22dsd" + "id": "eozzsx" } ], "size": "md", @@ -5488,7 +5488,7 @@ "attributes": {}, "components": [ { - "id": "eh8z2bfa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eh8z2bfa0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "panel", "tags": [], "tree": false, @@ -36017,7 +36017,7 @@ } ], "collapsible": false, - "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eof79400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json index 5c538fa8..9db85a44 100644 --- a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json +++ b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json @@ -1195,7 +1195,7 @@ "eq": "", "json": "" }, - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n \t\t var applicationStatus = response.applicationStatus?response.applicationStatus.value:'';\r\n\t if(response.deraStatus && response.deraStatus.value === 'Returned'){\r\n \t\t component.disabled = true;\r\n\t component.description = 'Disabled since DERA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\r\n\t }\r\n\t else if (applicationStatus === 'Resubmit') {\r\n\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since CSSA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t \r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nconst taskUrl = window.location.pathname.split('/');\r\nconst taskId = taskUrl[2];\r\nconst authToken = localStorage.getItem(\"authToken\");\r\nconst bpmUrl = localStorage.getItem(\"bpmApiUrl\");\r\nvar reqUrl = bpmUrl + \"/task/\" + taskId + \"/variables\";\r\n\r\n getData(reqUrl, authToken).then((response) => {\r\n \r\n \t\t var applicationStatus = response.applicationStatus?response.applicationStatus.value:'';\r\n\t\t var isCssaResubmitted = response.isCssaResubmitted?response.isCssaResubmitted.value:false;\r\n \t\t var isDeraResubmitted = response.isDeraResubmitted?response.isDeraResubmitted.value:false;\r\n\r\n\t if(isDeraResubmitted){\r\n \t\t component.disabled = true;\r\n\t component.description = 'Disabled since DERA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\r\n\t }\r\n\t else if (isCssaResubmitted) {\r\n\r\n\t component.disabled = true;\r\n\t component.description = 'Disabled since CSSA resubmission in progress';\r\n\t instance.triggerRedraw();\r\n\t } else {\r\n\t component.description = '';\r\n\t component.disabled = false;\r\n\t instance.triggerRedraw();\r\n\t }\r\n\t \r\n });\r\n\r\n\r\nasync function getData(reqUrl, authToken) {\r\n const response = await fetch(reqUrl, {\r\n method: \"GET\",\r\n headers: {\r\n \"Content-type\": \"application/json\",\r\n Accept: \"application/json\",\r\n Authorization: \"Bearer \" + authToken,\r\n },\r\n });\r\n const data = await response.json();\r\n return data;\r\n}", "logic": [], "attributes": {}, "overlay": { @@ -1246,7 +1246,7 @@ "showWordCount": false, "allowMultipleMasks": false, "addons": [], - "id": "epaslsk" + "id": "e6wka93" } ], "size": "md", @@ -5069,7 +5069,7 @@ "attributes": {}, "components": [ { - "id": "ele95t000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ele95t00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "spropertyOwnerAndOrOperator", "tree": false, "type": "panel", @@ -14481,7 +14481,7 @@ "attributes": {}, "components": [ { - "id": "eks0gu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eks0gu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "exposurePathwayQuestionnaireAffectedParcel", "tree": false, "type": "panel", @@ -18424,7 +18424,7 @@ } ], "collapsible": false, - "id": "eo5mwyp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eo5mwyp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn index c41cc175..9f2d982e 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn @@ -1,5 +1,5 @@ - + @@ -618,6 +618,14 @@ execution.setVariable('cssaStatus', "Resubmitted"); + + execution.setVariable('isCssaResubmitted', true); + + + + ["applicationId", "applicationStatus", "isCssaResubmitted"] + + ${action == 'Returned'} @@ -666,6 +674,14 @@ execution.setVariable('cssaStatus', "Resubmitted"); + + execution.setVariable('isCssaResubmitted', true); + + + + ["applicationId", "applicationStatus", "isCssaResubmitted"] + + ${action == 'Returned'} @@ -1004,6 +1020,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1058,6 +1082,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1131,6 +1163,14 @@ execution.setVariable('requestType', 'SRCR'); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1565,707 +1605,510 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - + + + - + - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + - + - - - - - - - - - - + + + - + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + - + - - - - - - - - - - - - - - - - - - + + + + - + - - - - - - - + + + - + - - - - - + + + + + - + - - - - - - - - - - - + + + - - - + + + - - - + + + - + - - - - - + + + + + - + - - - - - + + + - + - - - - - - - - - + + + + + - + - - - + + + - + - - - - - - - + + + - - - - + + + - + - - - + + + + - + - - - + + + - - - + + + - - - - - - + + + - - - + + + + - - - - - - - - + + + - - - - - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + - + - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - + + + - + - - - - - + + + + + + + + + - + - - - - - - + + + + + + - + - - - - - - - - + + + + + + + - + - - - - - + + - - + + - + - - + + + + + - - + + - + - - + + - - + + - - - - - + + - - - + + - - + + - - + + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - + + + - - - + + + - - - - + + + + + - + - - - + + + - + - - - - - - - + + + + + - + - - - - - + + + + - + - - - + + + + - + - - - - - + + + + + - + - - - + + + + + - + - - - + + + - - - + + + - - - - - + + + - + - - - + + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + - - - - - - - - + + + - - - + + + - + - - - + + + - + @@ -2277,277 +2120,68 @@ task.execution.setVariable('userRole','CSSA Team'); - - - + + + - + - - - + + + - + - - - - - - - - - - - - - - - + + + + - + - - - - - - + + + - - - - - - - - + + + + - - - - - - - + + + - - - - - - + + + + - - - + + + - - - + + + - - - - - - - - + + + + - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -2655,6 +2289,413 @@ task.execution.setVariable('userRole','CSSA Team'); + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn index 4f68aa08..948c9399 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn @@ -1,5 +1,5 @@ - + @@ -555,6 +555,14 @@ execution.setVariable('deraStatus', "Resubmitted"); + + execution.setVariable('isDeraResubmitted', true); + + + + ["applicationId", "applicationStatus", "isDeraResubmitted"] + + ${action == 'Returned'} @@ -603,6 +611,14 @@ execution.setVariable('deraStatus', "Resubmitted"); + + execution.setVariable('isDeraResubmitted', true); + + + + ["applicationId", "applicationStatus", "isDeraResubmitted"] + + ${action == 'Returned'} @@ -1148,6 +1164,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1202,6 +1226,14 @@ execution.setVariable('srcrStatus', "Resubmitted"); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1275,6 +1307,14 @@ execution.setVariable('requestType', 'SRCR'); + + execution.setVariable('isSrcrResubmitted', true); + + + + ["applicationId", "applicationStatus", "isSrcrResubmitted"] + + ${action == 'Returned' } @@ -1451,1060 +1491,1060 @@ execution.setVariable("applicationStatus", "Rejected"); - - - - - + + + + + + + + + + + + + + + + - + - - - - - - + + + - + - - - - - + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + - + - - - - - - - + + + + + - + - - - - - - - + + + - - - - + + + - - - - + + + - + - - - - - - - - + + + + + - + - - - - - - - - - + + + - + - - - - - - - - - - - + + + + + + + + - - - - - + + + - + - - - + + + - - - + + + - + - - - - - + + + + - + - - - - - - - - - - - + + + - - - + + + - - - - - - + + + - - - - - - - - + + + - - - - - - - - + + + - - - + + + - - - - - - - - + + + + + - - - + + - + - - - - - + + + + + + + + + + + - + - - - - - + + + + + + + + + - + - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + - - - - - - + + + - + - - - - + + + + + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + + + + + - + - - - - - - - - + + + - + - - - - - - - - - - + + - - + + - - + + - + - - + + + + + - + - - + + - - - + + + + + - - + + - - + + - + - - - + + + + + - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - - + + + - + - - - - - + + + + + + + + + + + + + - + - - - + + + - + - - - - - + + + + + - + - - - + + + + - + - - - + + + + + + + - - - + + + + + + + + - - - - - + + + + + - + - - - + + + + + + + + + + + - + - - - + + + + - + - - - - - - - - - - - + + + + + - + - - - + + + + - + - - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - - - + + + + - + - - - - - - - - - + + + + - + - - - - - - + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - + + + + + + + - - - + + + - - - + + + + - - - + + + - - - - - + + - + - - - - + + + + + + + + + - + - - - - + + + + + + + + + + + - + - - - - - - - - + + + - - - + + + + - + - - - + + + + + - + - - - - - - - - - - - - - - - - + + + - + - - - + + + + + - + - - - - - + + + + + - + - - - - - - - + + + - - - + + + - + - - - + + + - - - + + + - - - - - + + + - + - - - - - + + + + - + - - - - + + + + - + - - - - + + + - + - - - - - + + + + + - + - - - + + + + + + + + + - + - - - - - + + + + + - + - - - + + + + + + - - - + + + - - - + + + + + + + + + + + + + + + + + - + - - - - + + + - + - - - - + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + - + - - - + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + - + - - - - - - + + + + - + - - - - - - - + + + + + + + + + + - + - - - - - - - + + + + + + + + - + - - - + + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - - - - - - - - - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + + + + + + + + + + + + + + From da817637dc07e8193f5728bb754c81643d0f439c Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Tue, 7 Nov 2023 14:03:17 -0800 Subject: [PATCH 25/35] fix for volume mount issue --- .../templates/etl/debezium-postgis.build.yaml | 28 ---------- .../etl/debezium-postgis.deploy.yaml | 53 +++++++++++++++---- 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/openshift/templates/etl/debezium-postgis.build.yaml b/openshift/templates/etl/debezium-postgis.build.yaml index 270d4990..3548d589 100644 --- a/openshift/templates/etl/debezium-postgis.build.yaml +++ b/openshift/templates/etl/debezium-postgis.build.yaml @@ -57,31 +57,3 @@ parameters: description: The path to the docker file defining the build. required: false value: "Dockerfile" -- name: DEBEZIUM_VERSION - displayName: Debezium Version - description: Debezium image version. - required: false - value: "1.9" -- name: ORACLE_JDBC_VERSION - displayName: Oracle JDBC Version - description: Oracle JDBC Version. - required: false - value: "21.6.0.0" -- name: ORACLE_JDBC_MD5 - displayName: Oracle JDBC Checksum - description: Oracle JDBC File Checksum. - required: false - value: "312e6f4ec9932bbf74a4461669970c4b" -- name: KAFKA_JDBC_VERSION - displayName: Kafka JDBC Version - description: Kafka Jdbc Version. - required: false - value: "5.3.1" -- name: ORACLE_DB_HOST - displayName: Oracle DB Host - description: Oracle Database Host Name - required: true -- name: ORACLE_DB_PORT - displayName: Oracle DB Port - description: Oracle Database Port. - required: true diff --git a/openshift/templates/etl/debezium-postgis.deploy.yaml b/openshift/templates/etl/debezium-postgis.deploy.yaml index 6c5fa2c2..e7e75177 100644 --- a/openshift/templates/etl/debezium-postgis.deploy.yaml +++ b/openshift/templates/etl/debezium-postgis.deploy.yaml @@ -7,6 +7,19 @@ metadata: tags: "${API_NAME}" name: "${API_NAME}-deploy" objects: +- kind: PersistentVolumeClaim + apiVersion: v1 + metadata: + name: "${API_NAME}" + labels: + app: "${API_NAME}" + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: "${DB_PVC_SIZE}" + storageClassName: netapp-file-standard - kind: DeploymentConfig apiVersion: apps.openshift.io/v1 metadata: @@ -49,6 +62,10 @@ objects: template: "${API_NAME}-deploy" role: api spec: + volumes: + - name: "${API_NAME}" + persistentVolumeClaim: + claimName: "${API_NAME}" containers: - name: "${API_NAME}" image: "${API_NAME}" @@ -62,17 +79,15 @@ objects: - name: POSTGRES_PASSWORD value: postgres - name: POSTGRES_DB - value: postgres - resources: - requests: - cpu: "50m" - memory: "250Mi" - limits: - cpu: "150m" - memory: "500Mi" + value: postgres + - name: PGDATA + value: /var/lib/postgresql/data/pgdata terminationMessagePath: "/dev/termination-log" terminationMessagePolicy: File imagePullPolicy: Always + volumeMounts: + - name: "${API_NAME}" + mountPath: "/var/lib/postgresql/data" restartPolicy: Always terminationGracePeriodSeconds: 30 dnsPolicy: ClusterFirst @@ -140,4 +155,24 @@ parameters: displayName: Environment TAG name description: The TAG name for this environment, e.g., dev, test, prod required: true - value: latest \ No newline at end of file + value: latest +- description: Starting amount of CPU the container can use. + displayName: CPU REQUEST + name: CPU_REQUEST + value: '250m' +- description: Maximum amount of CPU the container can use. + displayName: CPU Limit + name: CPU_LIMIT + value: '1' +- description: Starting amount of memory the container can use. + displayName: Memory Request + name: MEMORY_REQUEST + value: 512Mi +- description: Maximum amount of memory the container can use. + displayName: Memory Limit + name: MEMORY_LIMIT + value: 512Mi +- description: The size of the persistent volume to create. + displayName: Persistent Volume Size + name: DB_PVC_SIZE + value: 1Gi \ No newline at end of file From 370e4966ed225ed18b5ffe378269df49e35f0334 Mon Sep 17 00:00:00 2001 From: nikhila-aot Date: Tue, 7 Nov 2023 19:17:12 -0800 Subject: [PATCH 26/35] unit test issue fix --- .../subProcess/CSSABundleWorklow.bpmn | 57 ++++++++++--------- .../subProcess/DERABundleWorkflow.bpmn | 25 ++++---- 2 files changed, 46 insertions(+), 36 deletions(-) diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn index 9f2d982e..dd7e31c7 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn @@ -585,12 +585,13 @@ system.out.println ("isSentFromSociety "+execution.getVariable('isSentFromSociet execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('isCssaResubmitted', false); - ["applicationId", "applicationStatus", "cssaStatus"] + ["applicationId", "applicationStatus", "cssaStatus","isCssaResubmitted"] @@ -691,11 +692,12 @@ execution.setVariable('cssaStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('cssaStatus', "Resubmitted"); +execution.setVariable('isCssaResubmitted', false); - ["applicationId", "applicationStatus", "cssaStatus"] + ["applicationId", "applicationStatus", "cssaStatus","isCssaResubmitted"] @@ -963,11 +965,12 @@ task.execution.setVariable('subFormName','SRCR Form'); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1036,12 +1039,13 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1110,11 +1114,12 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus", "isSrcrResubmitted"] @@ -1672,6 +1677,18 @@ task.execution.setVariable('userRole','CSSA Team'); + + + + + + + + + + + + @@ -1712,18 +1729,6 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - - - - - - - @@ -1932,6 +1937,10 @@ task.execution.setVariable('userRole','CSSA Team'); + + + + @@ -1944,10 +1953,6 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn index 948c9399..04071c28 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn @@ -522,12 +522,13 @@ system.out.println ("isSentFromSociety "+execution.getVariable('isSentFromSociet execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('isDeraResubmitted', false); - ["applicationId", "applicationStatus", "deraStatus"] + ["applicationId", "applicationStatus", "deraStatus","isDeraResubmitted"] @@ -628,11 +629,12 @@ execution.setVariable('deraStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('deraStatus', "Resubmitted"); +execution.setVariable('isDeraResubmitted', false); - ["applicationId", "applicationStatus", "deraStatus"] + ["applicationId", "applicationStatus", "deraStatus","isDeraResubmitted"] @@ -1107,11 +1109,12 @@ task.execution.setVariable('subFormName','SRCR Form'); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1180,12 +1183,13 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] @@ -1254,11 +1258,12 @@ execution.setVariable('srcrStatus', "Resubmitted"); execution.setVariable('applicationStatus', "Resubmitted"); execution.setVariable('requestStatus', "Resubmitted"); -execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('srcrStatus', "Resubmitted"); +execution.setVariable('isSrcrResubmitted', false); - ["applicationId", "applicationStatus", "srcrStatus"] + ["applicationId", "applicationStatus", "srcrStatus","isSrcrResubmitted"] From fc6c4b394b3e43f3fcdd8bea3f84874fbef681c3 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Thu, 9 Nov 2023 23:38:54 -0800 Subject: [PATCH 27/35] updated workflow to not to sent email for CSAP and CSAP society --- .../subProcess/CSSABundleWorklow.bpmn | 1682 ++++++++--------- .../subProcess/DERABundleWorkflow.bpmn | 1664 ++++++++-------- 2 files changed, 1631 insertions(+), 1715 deletions(-) diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn index dd7e31c7..691cc505 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/CSSABundleWorklow.bpmn @@ -1,5 +1,5 @@ - + @@ -19,19 +19,17 @@ Activity_1uc1xs1 Gateway_04o747e - Gateway_1ic0n5h Activity_08ykdar Gateway_0oobb3z Gateway_1gzq005 + Activity_1os7sys + Event_0bwdoce Activity_1ao3zkj Gateway_15p5urd - Gateway_19at9ur - Event_0bwdoce - Activity_1os7sys Gateway_1lbpcug @@ -185,7 +183,7 @@ system.out.println ("isSentFromSociety "+ execution.getVariable('isSentFromSocie ${action == 'Returned'} - + ${action == 'Recheck'} @@ -201,7 +199,7 @@ system.out.println ("isSentFromSociety "+ execution.getVariable('isSentFromSocie ${action == 'Accepted'} - + ${applicationStatus== 'Resubmitted' and isCssaTeam== true} @@ -1476,31 +1474,17 @@ task.execution.setVariable('userRole','CSSA Team'); Flow_0bz8atu - Flow_0lsoeu4 + Flow_0b418rv Flow_12uv3km Flow_0kfjdmp - - - Flow_0b418rv - Flow_0lsoeu4 - Flow_058nkip - - - Flow_0bq2rqv + Flow_0d8ruax Flow_0gb2oz2 Flow_0qw9o9a Flow_0pzpbn7 - - - Flow_0d8ruax - Flow_0bq2rqv - Flow_1rbr0l4 - - Flow_0iubwul Flow_19ktqsm @@ -1515,21 +1499,6 @@ task.execution.setVariable('userRole','CSSA Team'); Flow_16ek6dk - - Flow_14qx1q0 - - - - - - cssa_updated - - - Flow_058nkip - Flow_1rbr0l4 - Flow_16ek6dk - Flow_14qx1q0 - @@ -1578,6 +1547,19 @@ task.execution.setVariable('userRole','CSSA Team'); Flow_0wxa7vb Flow_1esdw3m + + + + + cssa_updated + + + Flow_16ek6dk + Flow_14qx1q0 + + + Flow_14qx1q0 + @@ -1610,510 +1592,697 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - + + + + - + - - - - - - - - - + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + + - + - - - + + + + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + - + - - - + + + + - + - - - - - - + + + + + - + - - - - - - - - - + + + + + + + + + + - + - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - - + + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + + - + - - - - - - - + + + - - - + + + - + - - - - - + + + + + - + - - - + + + + + + + + + + + + + + + + + + + - + - - - - - + + + + + - + - - - + + + + + - + - - - + + + - - - + + + + + - + - - - - + + + - + - - - + + + + + + + - - - + + + + + + + - - - + + + + + + - - - - + + + - - - + + + - - - - + + + + + + - - - - + + + - - - - - - - - - - - - - + + + + + - + - - - - - - - - - + + + + + + - + - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - + + - + - - + + - - + + - + - - - + + - - + + + + + - + - - + + - - - - - + + + - - + + - + - - + + - + - - + + - - - - - - - - + + - - + + + - - - - - - - + + + + - - - - - - - + + + + - - - - - - + + + - - - + + + + - - - + + + - - - - - + + + + + + + + + + + + - + - - - + + + - + - - - - - + + + + + + + - + - - - - + + + + + - + - - - - + + + - + - - - - - + + + + + - + - - - - - + + + - + - - - + + + - - - + + + - - - + + + + + - + - - - - + + + - + - - - - - + + + - + - - - + + + + + + + + + + + - + - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + + - - - + + + + + + + + + + + + + + + + + + - + - - - + + + - + + + + + + + + @@ -2125,60 +2294,269 @@ task.execution.setVariable('userRole','CSSA Team'); - - - + + + - + - - - + + + - + - - - - + + + + + + + + + + + + + + + - + - - - - - - - - + + + + + + - - - + + + + + + + + - - - - + + + + + + + - - - + + + + + + - - - + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2243,18 +2621,12 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - @@ -2264,13 +2636,6 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - - @@ -2294,413 +2659,6 @@ task.execution.setVariable('userRole','CSSA Team'); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn index 04071c28..63de0e52 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-bpm/processes/Bundling/subProcess/DERABundleWorkflow.bpmn @@ -1,5 +1,5 @@ - + @@ -16,20 +16,18 @@ Activity_1uc1xs1 - Activity_1os7sys Gateway_04o747e - Gateway_04zwcaq - Event_1mmor63 Activity_08ykdar Gateway_0oobb3z Gateway_1jh43p2 + Activity_1os7sys + Event_1mmor63 Activity_1ao3zkj Gateway_15p5urd - Gateway_1p7skmz Gateway_1lbpcug @@ -152,7 +150,7 @@ system.out.println ("isSentFromSociety "+ execution.getVariable('isSentFromSocie ${action == 'Returned'} - + ${action == 'Recheck'} @@ -168,7 +166,7 @@ system.out.println ("isSentFromSociety "+ execution.getVariable('isSentFromSocie ${action == 'Accepted'} - + ${applicationStatus== 'Resubmitted' and isCssaTeam== true} @@ -837,20 +835,8 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); Flow_0lgivc3 - - - - - dera_updated - - - Flow_1h10kqx - Flow_0yrx5xj - Flow_1sj5fc8 - Flow_1kvztr8 - - Flow_1s7krwr + Flow_0b418rv Flow_12uv3km Flow_0kfjdmp @@ -861,26 +847,12 @@ system.out.println ("srcoAssignment"+execution.getVariable('srcoAssignment')); Flow_1ev1kr6 Flow_0qbjx6e - - - Flow_0b418rv - Flow_1s7krwr - Flow_1h10kqx - - - - - Flow_12oauvz + Flow_0d8ruax Flow_0gb2oz2 Flow_0qw9o9a Flow_0pzpbn7 - - Flow_0d8ruax - Flow_12oauvz - Flow_0yrx5xj - @@ -1407,9 +1379,6 @@ execution.setVariable('requestType', 'SRCR'); Flow_1v6zje9 - - Flow_1kvztr8 - @@ -1464,6 +1433,19 @@ execution.setVariable("applicationStatus", "Rejected"); Flow_1ij7p7z Flow_165eq8z + + + + + dera_updated + + + Flow_1sj5fc8 + Flow_1kvztr8 + + + Flow_1kvztr8 + @@ -1496,1060 +1478,1036 @@ execution.setVariable("applicationStatus", "Rejected"); - - - - - - - - - - - - - - - - + + + + + - + - - - + + + + + + - + - - - - - - - - - - - - - - - + + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + - + - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + + + + - + - - - + + + + + + + + + + - + - - - - - - - - - - - - - - - - - + + + + + + + + - + - - - + + + + - + - - - - - + + + + + + + + + - + - - - - - - - + + + + - - - + + + - + - - - - - - - - + + + - - - + + + + + - + - - - - - - - - + + + + + - - - + + + + + + + + + + + - + - - - + + + - - - + + + - + - - - - + + + + + - + - - - - - - - - - - - - - - - + + + + + - - - + + + + + - - - + + + - - - - - + + + + + + - - + + + + + - + - - - - - - - - - - - + + + + + + - + - - - - - - - - - + + + + + + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - - - - + + + + + - + - - - + + + + + - + - - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - + - - - - - - - - - + + + + + + + + + + - + - - - + + + + + + - + - - - - - - - - - + + + + - + - - - - - - + + + + + + - + - - - - - - - + + + + + - + + + + + + + + + + + + + + + + - - + + + + + - - + + + + + - + - - + + - + - - + + + + + + + + + + + + + + - + - - - - - + + - - + + + - - + + - - + + + - - - - - - - + + + + + - - - - - - - + + + - - - - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - + + + + + + + + - + - - - - - + + + - + - - - - - - - + + + - - - - + + + - + - - - - - + + + + + - + - - - - - + + + - + - - - - - - - - - - - + + + + + - + - - - - + + + - + - - - - - - - - + + + - - - - - - + + + - - - - + + + + + - + - - - - - - - - - - - - - - - + + + - + - - - + + + - + - - - - - + + + + + + + + + + + - + - - - - + + + - + - - - - + + + + + + - + - - - - - - + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - + + + - - + + - - + + + + + + + + - + - - + + - - + + + - - - + + - + - - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + - + - - - - + + + + + + + + + + - + - - - - - - + + + - + - - - - - - + + + - + + + + + + + + + + + + - - - + + + + - - - - - - + + + - - - + + + + - - - + + + - - - - - - + + + - - - - - - - + + + - - - - + + + + + - + - - - + + + - + - - - - - + + + - + - - - - - - - - - + + + + + - + - - - - - + + + - + - - - + + + - + - - - + + + - - - - - + + + - - - - - + + + - - - - - + + + + - + - - - + + + - + - - - + + + + + + + + - - - - - + + + + - + - - - - - - - - - - - - - - - - - + + + - + - - - + + + - - - + + + + + + + + + - + - - - - - - - - - + + + + + - + - - - - - - - - - + + + + - + - - - + + + + - + - - - - - - - - - + + + + + - + - - - + + + + + + - - - + + + + + - + - - - + + + - - - + + + - - - - - + + + - + - - - + + + + - + - - - - - + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + - - - - - - + + + + + + + + + - + - - - - - - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From a7428dcf97439e047b8d62c054ee7cf0632077bc Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Fri, 10 Nov 2023 15:22:46 -0800 Subject: [PATCH 28/35] port and resource configurations --- openshift/templates/etl/debezium-jdbc.deploy.yaml | 10 +++++----- openshift/templates/etl/debezium-kafka.deploy.yaml | 6 +++--- openshift/templates/etl/debezium-postgis.deploy.yaml | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/openshift/templates/etl/debezium-jdbc.deploy.yaml b/openshift/templates/etl/debezium-jdbc.deploy.yaml index 8cfba074..7c632661 100644 --- a/openshift/templates/etl/debezium-jdbc.deploy.yaml +++ b/openshift/templates/etl/debezium-jdbc.deploy.yaml @@ -54,11 +54,11 @@ objects: image: "${API_NAME}" imagePullPolicy: Always ports: - - containerPort: 9092 + - containerPort: 8083 protocol: TCP env: - name: BOOTSTRAP_SERVERS - value: "kafka:9092" + value: "debezium-kafka:9092" - name: GROUP_ID value: "1" - name: CONFIG_STORAGE_TOPIC @@ -73,11 +73,11 @@ objects: value: "n" resources: requests: - cpu: "50m" - memory: "250Mi" - limits: cpu: "150m" memory: "500Mi" + limits: + cpu: "250m" + memory: "1Gi" terminationMessagePath: "/dev/termination-log" terminationMessagePolicy: File imagePullPolicy: Always diff --git a/openshift/templates/etl/debezium-kafka.deploy.yaml b/openshift/templates/etl/debezium-kafka.deploy.yaml index 7bef3657..4cb4bc7f 100644 --- a/openshift/templates/etl/debezium-kafka.deploy.yaml +++ b/openshift/templates/etl/debezium-kafka.deploy.yaml @@ -52,11 +52,11 @@ objects: value: debezium-zookeeper:2181 resources: requests: - cpu: "50m" - memory: "250Mi" - limits: cpu: "150m" memory: "500Mi" + limits: + cpu: "250m" + memory: "1Gi" terminationMessagePath: "/dev/termination-log" terminationMessagePolicy: File imagePullPolicy: Always diff --git a/openshift/templates/etl/debezium-postgis.deploy.yaml b/openshift/templates/etl/debezium-postgis.deploy.yaml index e7e75177..d56656c3 100644 --- a/openshift/templates/etl/debezium-postgis.deploy.yaml +++ b/openshift/templates/etl/debezium-postgis.deploy.yaml @@ -71,7 +71,7 @@ objects: image: "${API_NAME}" imagePullPolicy: Always ports: - - containerPort: 9092 + - containerPort: 5432 protocol: TCP env: - name: POSTGRES_USER @@ -104,10 +104,10 @@ objects: template: "${API_NAME}-deploy" spec: ports: - - name: 7432-tcp + - name: 5432-tcp protocol: TCP port: 5432 - targetPort: 7432 + targetPort: 5432 selector: deploymentconfig: "${API_NAME}" type: ClusterIP @@ -128,7 +128,7 @@ objects: name: "${API_NAME}" weight: 100 port: - targetPort: 7432-tcp + targetPort: 5432-tcp tls: termination: edge wildcardPolicy: None From b794724ce671d228ea5c5812e556dc286cda64f5 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Wed, 15 Nov 2023 09:47:47 -0800 Subject: [PATCH 29/35] fixed next reviewer button not displayed for caseworker --- .../bundling/Site Risk Classification Report.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json index 09bd5e22..e3412f7d 100644 --- a/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json +++ b/forms-flow-ai/epd-forms/bundling/Site Risk Classification Report.json @@ -1020,7 +1020,7 @@ "eq": "", "json": "" }, - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\r\nconst roles = UserDetails[\"role\"];\r\n\r\nif(roles.includes(\"formsflow-reviewer/site-risk-classification-officer\")) \r\n{\r\n show = true;\r\n}\r\nelse if (roles.includes(\"formsflow-reviewer/caseworker\") &&\r\ndata.srcrBundleStatus === \"srcrSrcoAccepted\")\r\n{\r\n if (data.typeOfReview === \"applicationViaTheSocietyOfContaminatedSitesApprovedProfessionalsOfBc\" ||\r\n data.siteRiskClassification !== 'notHighRisk')\r\n show = false;\r\nelse\r\n show = true;\r\n}\r\nelse\r\n{\r\n show = false;\r\n}", + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"))\nconst roles = UserDetails[\"role\"];\n\nif(roles.includes(\"formsflow-reviewer/site-risk-classification-officer\")) \n{\n show = true;\n}\nelse if (roles.includes(\"formsflow-reviewer/caseworker\") &&\ndata.srcrBundleStatus === \"srcrSrcoAccepted\")\n{\n if (data.typeOfReview === \"applicationViaTheSocietyOfContaminatedSitesApprovedProfessionalsOfBc\" ||\n data.siteRiskClassification !== 'notHighRisk')\n show = false;\nelse\n show = true;\n}\nelse if (roles.includes(\"formsflow-reviewer/caseworker\") && data.srcrBundleStatus === \"srcrCaseworkerAccepted\")\n{\n // Incase of returned by SDM\n show = true;\n}\nelse\n{\n show = false;\n}", "logic": [], "attributes": {}, "overlay": { @@ -1072,7 +1072,7 @@ "showWordCount": false, "allowMultipleMasks": false, "addons": [], - "id": "eznm0q" + "id": "eilltmi" }, { "label": "Approved", @@ -5069,7 +5069,7 @@ "attributes": {}, "components": [ { - "id": "ele95t00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ele95t000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "spropertyOwnerAndOrOperator", "tree": false, "type": "panel", @@ -14481,7 +14481,7 @@ "attributes": {}, "components": [ { - "id": "eks0gu0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eks0gu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "key": "exposurePathwayQuestionnaireAffectedParcel", "tree": false, "type": "panel", @@ -18424,7 +18424,7 @@ } ], "collapsible": false, - "id": "eo5mwyp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eo5mwyp000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", From 82e348bb9d0261ce46a5be0baf866c40741fc729 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Wed, 15 Nov 2023 11:35:15 -0800 Subject: [PATCH 30/35] srs-164 changes to reduce debezium logs --- etl/debezium-jdbc/Dockerfile | 2 + etl/debezium-jdbc/connect-log4j.properties | 42 +++++++++++++++++++ etl/debezium-jdbc/log4j.properties | 23 ++++++++++ etl/docker-compose.yaml | 2 +- .../templates/etl/debezium-jdbc.deploy.yaml | 2 +- 5 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 etl/debezium-jdbc/connect-log4j.properties create mode 100644 etl/debezium-jdbc/log4j.properties diff --git a/etl/debezium-jdbc/Dockerfile b/etl/debezium-jdbc/Dockerfile index 997ff2ac..14ddecf2 100644 --- a/etl/debezium-jdbc/Dockerfile +++ b/etl/debezium-jdbc/Dockerfile @@ -34,6 +34,8 @@ COPY --from=builder /app/target/*.jar $KAFKA_CONNECT_JDBC_DIR/ COPY --from=builder /app/lib/*.jar $KAFKA_CONNECT_JDBC_DIR/ COPY InstallCert.class . COPY "InstallCert\$SavingTrustManager.class" . +COPY connect-log4j.properties /kafka/config/ +COPY log4j.properties /kafka/config/ RUN java InstallCert --quiet "${ORACLE_DB_HOST}:${ORACLE_DB_PORT}" RUN keytool -exportcert -alias "$ORACLE_DB_HOST-1" -keystore jssecacerts -storepass changeit -file oracle.cer diff --git a/etl/debezium-jdbc/connect-log4j.properties b/etl/debezium-jdbc/connect-log4j.properties new file mode 100644 index 00000000..f17e2bb2 --- /dev/null +++ b/etl/debezium-jdbc/connect-log4j.properties @@ -0,0 +1,42 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +log4j.rootLogger=ERROR, stdout, connectAppender + +# Send the logs to the console. +# +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout + +# Send the logs to a file, rolling the file at midnight local time. For example, the `File` option specifies the +# location of the log files (e.g. ${kafka.logs.dir}/connect.log), and at midnight local time the file is closed +# and copied in the same directory but with a filename that ends in the `DatePattern` option. +# +log4j.appender.connectAppender=org.apache.log4j.DailyRollingFileAppender +log4j.appender.connectAppender.DatePattern='.'yyyy-MM-dd-HH +log4j.appender.connectAppender.File=${kafka.logs.dir}/connect.log +log4j.appender.connectAppender.layout=org.apache.log4j.PatternLayout + +# The `%X{connector.context}` parameter in the layout includes connector-specific and task-specific information +# in the log messages, where appropriate. This makes it easier to identify those log messages that apply to a +# specific connector. +# +connect.log.pattern=[%d] %p %X{connector.context}%m (%c:%L)%n + +log4j.appender.stdout.layout.ConversionPattern=${connect.log.pattern} +log4j.appender.connectAppender.layout.ConversionPattern=${connect.log.pattern} + +log4j.logger.org.apache.zookeeper=ERROR +log4j.logger.org.reflections=ERROR diff --git a/etl/debezium-jdbc/log4j.properties b/etl/debezium-jdbc/log4j.properties new file mode 100644 index 00000000..272d67e7 --- /dev/null +++ b/etl/debezium-jdbc/log4j.properties @@ -0,0 +1,23 @@ +kafka.logs.dir=logs + +log4j.rootLogger=INFO, stdout, appender + +# Disable excessive reflection warnings - KAFKA-5229 +log4j.logger.org.reflections=ERROR + +# Disable excessive logging by consumers and producers. +log4j.logger.org.apache.kafka=ERROR +log4j.logger.org.apache.kafka.clients.consumer=WARN + +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.threshold=INFO +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %X{dbz.connectorType}|%X{dbz.connectorName}|%X{dbz.connectorContext} %m [%c]%n + + +log4j.appender.appender=org.apache.log4j.DailyRollingFileAppender +log4j.appender.appender.DatePattern='.'yyyy-MM-dd-HH +log4j.appender.appender.File=${kafka.logs.dir}/connect-service.log +log4j.appender.appender.layout=org.apache.log4j.PatternLayout +log4j.appender.appender.layout.ConversionPattern=%d{ISO8601} %-5p %X{dbz.connectorType}|%X{dbz.connectorName}|%X{dbz.connectorContext} %m [%c]%n + diff --git a/etl/docker-compose.yaml b/etl/docker-compose.yaml index 841eeff0..579f5c39 100644 --- a/etl/docker-compose.yaml +++ b/etl/docker-compose.yaml @@ -19,7 +19,7 @@ services: build: context: debezium-postgis/15-3.3 ports: - - "5432:5432" + - "7432:5432" environment: - POSTGRES_USER=postgres - POSTGRES_PASSWORD=postgres diff --git a/openshift/templates/etl/debezium-jdbc.deploy.yaml b/openshift/templates/etl/debezium-jdbc.deploy.yaml index 7c632661..b3121d70 100644 --- a/openshift/templates/etl/debezium-jdbc.deploy.yaml +++ b/openshift/templates/etl/debezium-jdbc.deploy.yaml @@ -68,7 +68,7 @@ objects: - name: STATUS_STORAGE_TOPIC value: "epd_connect_statuses" - name: KAFKA_DEBUG - value: "true" + value: "false" - name: DEBUG_SUSPEND_FLAG value: "n" resources: From 5f70a6b0bd8847ad57169f9a68247a6d4e755efe Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Wed, 15 Nov 2023 13:27:55 -0800 Subject: [PATCH 31/35] fixed lat/long validation and updated calender component --- .../epd-forms/Summary of Site Condition.json | 1537 ++++++++++------- 1 file changed, 881 insertions(+), 656 deletions(-) diff --git a/forms-flow-ai/epd-forms/Summary of Site Condition.json b/forms-flow-ai/epd-forms/Summary of Site Condition.json index cb37f846..d251f6f8 100644 --- a/forms-flow-ai/epd-forms/Summary of Site Condition.json +++ b/forms-flow-ai/epd-forms/Summary of Site Condition.json @@ -7929,7 +7929,7 @@ "required": true, "pattern": "", "customMessage": "", - "custom": "", + "custom": "\nif(/^[0-9]+$/.test(input) && input>= 0){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Degrees\";\n}\n", "customPrivate": false, "json": "", "minLength": "", @@ -7968,7 +7968,7 @@ "dataGridLabel": false, "addons": [], "inputType": "text", - "id": "ej4283", + "id": "er86sr", "defaultValue": "" } ], @@ -8027,7 +8027,7 @@ "required": true, "pattern": "", "customMessage": "", - "custom": "", + "custom": "if(/^[0-9]+$/.test(input) && input>= 0 && input<= 60){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Minutes\";\n}", "customPrivate": false, "json": "", "minLength": "", @@ -8066,7 +8066,7 @@ "dataGridLabel": false, "addons": [], "inputType": "text", - "id": "exj2tgn", + "id": "eiu61m", "defaultValue": "" } ], @@ -8125,7 +8125,7 @@ "required": true, "pattern": "", "customMessage": "", - "custom": "", + "custom": "if (/^\\d+(\\.\\d+)?$/.test(input) && parseFloat(input) >= 0 && parseFloat(input) <= 60) {\n valid = true;\n} else {\n valid = \"Invalid Seconds\";\n}\n", "customPrivate": false, "json": "", "minLength": "", @@ -8164,7 +8164,7 @@ "dataGridLabel": false, "addons": [], "inputType": "text", - "id": "ew69io", + "id": "er0cc1a", "defaultValue": "" } ], @@ -8363,7 +8363,7 @@ "required": true, "pattern": "", "customMessage": "", - "custom": "", + "custom": "\nif(/^[0-9]+$/.test(input) && input>= 0){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Degrees\";\n}\n", "customPrivate": false, "json": "", "minLength": "", @@ -8402,7 +8402,7 @@ "dataGridLabel": false, "addons": [], "inputType": "text", - "id": "ee3hzk4oe", + "id": "e252afv", "defaultValue": "" } ], @@ -8461,7 +8461,7 @@ "required": true, "pattern": "", "customMessage": "", - "custom": "", + "custom": "if(/^[0-9]+$/.test(input) && input>= 0 && input<= 60){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Minutes\";\n}", "customPrivate": false, "json": "", "minLength": "", @@ -8500,7 +8500,7 @@ "dataGridLabel": false, "addons": [], "inputType": "text", - "id": "eidw1st", + "id": "e4vku6d", "defaultValue": "" } ], @@ -8559,7 +8559,7 @@ "required": true, "pattern": "", "customMessage": "", - "custom": "", + "custom": "if (/^\\d+(\\.\\d+)?$/.test(input) && parseFloat(input) >= 0 && parseFloat(input) <= 60) {\n valid = true;\n} else {\n valid = \"Invalid Seconds\";\n}\n", "customPrivate": false, "json": "", "minLength": "", @@ -8598,7 +8598,7 @@ "dataGridLabel": false, "addons": [], "inputType": "text", - "id": "e9ytskc", + "id": "evsub3p", "defaultValue": "" } ], @@ -8670,7 +8670,7 @@ "id": "ej1mdrb" } ], - "id": "ej7yhy000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ej7yhy00000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -9710,7 +9710,7 @@ "id": "eqnyhh" } ], - "id": "eskogm000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eskogm00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -10242,7 +10242,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "e0cqfrg000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "id": "e0cqfrg00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ], "layoutFixed": false, @@ -10341,7 +10341,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "elizdoh000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "elizdoh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -11003,82 +11003,92 @@ "offset": 0, "components": [ { - "key": "section2LatitudeDegrees2", - "type": "textfield", - "input": true, "label": "Degrees", - "validate": { - "required": true, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" - }, - "tableView": false, - "hideOnChildrenHidden": false, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "disabled": false, + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": false, + "tableView": false, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", + "validate": { + "required": true, + "pattern": "", + "customMessage": "", + "custom": "if(/^[0-9]+$/.test(input) && input>= 0){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Degrees\";\n}\n", + "customPrivate": false, + "json": "", + "minLength": "", + "maxLength": "", + "strictDateValidation": false, + "multiple": false, + "unique": false + }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "section2LatitudeDegrees2", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "hideOnChildrenHidden": false, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "ey5x9g8" + "id": "e9nam5l", + "defaultValue": "" } ], "currentWidth": 4 @@ -11091,82 +11101,92 @@ "offset": 0, "components": [ { - "key": "section2LatitudeMinutes2", - "type": "textfield", - "input": true, "label": "Minutes", - "validate": { - "required": true, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" - }, - "tableView": false, - "hideOnChildrenHidden": false, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "disabled": false, + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": false, + "tableView": false, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", + "validate": { + "required": true, + "pattern": "", + "customMessage": "", + "custom": "if(/^[0-9]+$/.test(input) && input>= 0 && input<= 60){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Minutes\";\n}\n", + "customPrivate": false, + "json": "", + "minLength": "", + "maxLength": "", + "strictDateValidation": false, + "multiple": false, + "unique": false + }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "section2LatitudeMinutes2", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "hideOnChildrenHidden": false, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "e1ftky" + "id": "edhzq1e", + "defaultValue": "" } ], "currentWidth": 4 @@ -11179,82 +11199,92 @@ "offset": 0, "components": [ { - "key": "section2LatitudeSeconds2", - "type": "textfield", - "input": true, "label": "Seconds", - "validate": { - "required": true, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" - }, - "tableView": false, - "hideOnChildrenHidden": false, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "disabled": false, + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": false, + "tableView": false, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", + "validate": { + "required": true, + "pattern": "", + "customMessage": "", + "custom": "\nif (/^\\d+(\\.\\d+)?$/.test(input) && parseFloat(input) >= 0 && parseFloat(input) <= 60) {\n valid = true;\n} else {\n valid = \"Invalid Seconds\";\n}", + "customPrivate": false, + "json": "", + "minLength": "", + "maxLength": "", + "strictDateValidation": false, + "multiple": false, + "unique": false + }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "section2LatitudeSeconds2", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "hideOnChildrenHidden": false, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "e4whd08" + "id": "eacl9yw", + "defaultValue": "" } ], "currentWidth": 4 @@ -11407,82 +11437,92 @@ "offset": 0, "components": [ { - "key": "section2LongitudeDegrees2", - "type": "textfield", - "input": true, "label": "Degrees", - "validate": { - "required": true, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" - }, - "tableView": false, - "hideOnChildrenHidden": false, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "disabled": false, + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": false, + "tableView": false, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", + "validate": { + "required": true, + "pattern": "", + "customMessage": "", + "custom": "if(/^[0-9]+$/.test(input) && input>= 0){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Degrees\";\n}\n", + "customPrivate": false, + "json": "", + "minLength": "", + "maxLength": "", + "strictDateValidation": false, + "multiple": false, + "unique": false + }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "section2LongitudeDegrees2", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "hideOnChildrenHidden": false, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "eayewmr" + "id": "ep4hqx", + "defaultValue": "" } ], "currentWidth": 4 @@ -11495,82 +11535,92 @@ "offset": 0, "components": [ { - "key": "section2LongitudeMinutes2", - "type": "textfield", - "input": true, "label": "Minutes", - "validate": { - "required": true, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" - }, - "tableView": false, - "hideOnChildrenHidden": false, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "disabled": false, + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": false, + "tableView": false, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", + "validate": { + "required": true, + "pattern": "", + "customMessage": "", + "custom": "if(/^[0-9]+$/.test(input) && input>= 0 && input<= 60){\n\tvalid=true;\n}else{\n\tvalid = \"Invalid Minutes\";\n}\n", + "customPrivate": false, + "json": "", + "minLength": "", + "maxLength": "", + "strictDateValidation": false, + "multiple": false, + "unique": false + }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "section2LongitudeMinutes2", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "hideOnChildrenHidden": false, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "eg5a19" + "id": "eo8ju6o", + "defaultValue": "" } ], "currentWidth": 4 @@ -11583,82 +11633,92 @@ "offset": 0, "components": [ { - "key": "section2LongitudeSeconds2", - "type": "textfield", - "input": true, "label": "Seconds", - "validate": { - "required": true, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" - }, - "tableView": false, - "hideOnChildrenHidden": false, + "labelPosition": "top", "placeholder": "", + "description": "", + "tooltip": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, + "widget": { + "type": "input" + }, + "inputMask": "", + "displayMask": "", + "allowMultipleMasks": false, + "customClass": "", + "tabindex": "", + "autocomplete": "", "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", "hideLabel": false, - "tabindex": "", - "disabled": false, + "showWordCount": false, + "showCharCount": false, + "mask": false, "autofocus": false, + "spellcheck": true, + "disabled": false, + "tableView": false, + "modalEdit": false, + "multiple": false, + "persistent": true, + "inputFormat": "plain", + "protected": false, "dbIndex": false, + "case": "", + "truncateMultipleSpaces": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", + "validate": { + "required": true, + "pattern": "", + "customMessage": "", + "custom": "\nif (/^\\d+(\\.\\d+)?$/.test(input) && parseFloat(input) >= 0 && parseFloat(input) <= 60) {\n valid = true;\n} else {\n valid = \"Invalid Seconds\";\n}", + "customPrivate": false, + "json": "", + "minLength": "", + "maxLength": "", + "strictDateValidation": false, + "multiple": false, + "unique": false + }, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "section2LongitudeSeconds2", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, + "type": "textfield", + "input": true, + "hideOnChildrenHidden": false, + "refreshOn": "", + "dataGridLabel": false, "addons": [], - "mask": false, "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "evt9aao" + "id": "eo46qw", + "defaultValue": "" } ], "currentWidth": 4 @@ -11729,7 +11789,7 @@ "id": "e6o3au0o" } ], - "id": "erlwlrl0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "erlwlrl000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -12762,7 +12822,7 @@ "id": "eg4rrls" } ], - "id": "ehjtgz00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ehjtgz0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -13361,7 +13421,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "emjblk600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "id": "emjblk60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ], "placeholder": "", @@ -13405,7 +13465,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "eh8kmqu000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eh8kmqu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -14145,176 +14205,216 @@ "displayMask": "", "spellcheck": true, "truncateMultipleSpaces": false, - "id": "e839axn" + "id": "e839axn" + }, + { + "label": "Author/Company", + "tableView": true, + "key": "authorCompany", + "type": "textfield", + "input": true, + "placeholder": "", + "prefix": "", + "customClass": "", + "suffix": "", + "multiple": false, + "defaultValue": null, + "protected": false, + "unique": false, + "persistent": true, + "hidden": false, + "clearOnHide": true, + "refreshOn": "", + "redrawOn": "", + "modalEdit": false, + "dataGridLabel": false, + "labelPosition": "top", + "description": "", + "errorLabel": "", + "tooltip": "", + "hideLabel": false, + "tabindex": "", + "disabled": false, + "autofocus": false, + "dbIndex": false, + "customDefaultValue": "", + "calculateValue": "", + "calculateServer": false, + "widget": { + "type": "input" + }, + "attributes": {}, + "validateOn": "change", + "validate": { + "required": false, + "custom": "", + "customPrivate": false, + "strictDateValidation": false, + "multiple": false, + "unique": false, + "minLength": "", + "maxLength": "", + "pattern": "" + }, + "conditional": { + "show": null, + "when": null, + "eq": "" + }, + "overlay": { + "style": "", + "left": "", + "top": "", + "width": "", + "height": "" + }, + "allowCalculateOverride": false, + "encrypted": false, + "showCharCount": false, + "showWordCount": false, + "properties": {}, + "allowMultipleMasks": false, + "addons": [], + "mask": false, + "inputType": "text", + "inputFormat": "plain", + "inputMask": "", + "displayMask": "", + "spellcheck": true, + "truncateMultipleSpaces": false, + "id": "eum71oo" }, { - "label": "Author/Company", - "tableView": true, - "key": "authorCompany", - "type": "textfield", - "input": true, - "placeholder": "", - "prefix": "", - "customClass": "", - "suffix": "", - "multiple": false, - "defaultValue": null, - "protected": false, - "unique": false, - "persistent": true, - "hidden": false, - "clearOnHide": true, - "refreshOn": "", - "redrawOn": "", - "modalEdit": false, - "dataGridLabel": false, + "label": "Document Date", "labelPosition": "top", + "displayInTimezone": "viewer", + "useLocaleSettings": false, + "allowInput": true, + "format": "yyyy-MM-dd", + "placeholder": "", "description": "", - "errorLabel": "", "tooltip": "", - "hideLabel": false, + "customClass": "", "tabindex": "", - "disabled": false, + "hidden": false, + "hideLabel": false, "autofocus": false, + "disabled": false, + "tableView": false, + "modalEdit": false, + "shortcutButtons": [], + "enableDate": true, + "datePicker": { + "disable": "", + "disableFunction": "", + "disableWeekends": false, + "disableWeekdays": false, + "minDate": null, + "maxDate": null, + "showWeeks": true, + "startingDay": 0, + "initDate": "", + "minMode": "day", + "maxMode": "year", + "yearRows": 4, + "yearColumns": 5 + }, + "enableTime": false, + "timePicker": { + "showMeridian": true, + "hourStep": 1, + "minuteStep": 1, + "readonlyInput": false, + "mousewheel": true, + "arrowkeys": true + }, + "multiple": false, + "defaultValue": "", + "defaultDate": "", + "customOptions": {}, + "persistent": true, + "protected": false, "dbIndex": false, + "encrypted": false, + "redrawOn": "", + "clearOnHide": true, "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": { - "type": "input" - }, - "attributes": {}, + "allowCalculateOverride": false, "validateOn": "change", "validate": { - "required": false, + "required": true, + "customMessage": "", "custom": "", "customPrivate": false, + "json": "", "strictDateValidation": false, "multiple": false, - "unique": false, - "minLength": "", - "maxLength": "", - "pattern": "" + "unique": false }, + "enableMinDateInput": false, + "enableMaxDateInput": false, + "unique": false, + "errorLabel": "", + "errors": "", + "key": "documentDate", + "tags": [], + "properties": {}, "conditional": { "show": null, "when": null, - "eq": "" + "eq": "", + "json": "" }, + "customConditional": "", + "logic": [], + "attributes": {}, "overlay": { "style": "", + "page": "", "left": "", "top": "", "width": "", "height": "" }, - "allowCalculateOverride": false, - "encrypted": false, - "showCharCount": false, - "showWordCount": false, - "properties": {}, - "allowMultipleMasks": false, - "addons": [], - "mask": false, - "inputType": "text", - "inputFormat": "plain", - "inputMask": "", - "displayMask": "", - "spellcheck": true, - "truncateMultipleSpaces": false, - "id": "eum71oo" - }, - { - "label": "Document Date", + "type": "datetime", + "timezone": "", + "input": true, "hideInputLabels": false, - "inputsLabelPosition": "top", - "useLocaleSettings": false, - "tableView": false, - "fields": { - "day": { - "hide": false, - "type": "number", - "placeholder": "", - "required": false - }, - "month": { - "hide": false, - "type": "select", - "placeholder": "", - "required": false - }, - "year": { - "hide": false, - "type": "number", - "placeholder": "", - "required": false - } + "widget": { + "type": "calendar", + "displayInTimezone": "viewer", + "locale": "en", + "useLocaleSettings": false, + "allowInput": true, + "mode": "single", + "enableTime": false, + "noCalendar": false, + "format": "yyyy-MM-dd", + "hourIncrement": 1, + "minuteIncrement": 1, + "time_24hr": false, + "minDate": null, + "disabledDates": "", + "disableWeekends": false, + "disableWeekdays": false, + "disableFunction": "", + "maxDate": null }, - "key": "documentDate", - "type": "day", - "input": true, - "defaultValue": "00/00/0000", - "placeholder": "", "prefix": "", - "customClass": "", "suffix": "", - "multiple": false, - "protected": false, - "unique": false, - "persistent": true, - "hidden": false, - "clearOnHide": true, "refreshOn": "", - "redrawOn": "", - "modalEdit": false, "dataGridLabel": false, - "labelPosition": "top", - "description": "", - "errorLabel": "", - "tooltip": "", - "hideLabel": false, - "tabindex": "", - "disabled": false, - "autofocus": false, - "dbIndex": false, - "customDefaultValue": "", - "calculateValue": "", - "calculateServer": false, - "widget": null, - "attributes": {}, - "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, - "conditional": { - "show": null, - "when": null, - "eq": "" - }, - "overlay": { - "style": "", - "left": "", - "top": "", - "width": "", - "height": "" - }, - "allowCalculateOverride": false, - "encrypted": false, "showCharCount": false, "showWordCount": false, - "properties": {}, "allowMultipleMasks": false, "addons": [], - "dayFirst": false, - "id": "egqqs34" + "datepickerMode": "day", + "id": "edt3c4" } ], - "id": "e80y9k800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e80y9k80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -21856,7 +21956,7 @@ "id": "es5kcwo" } ], - "id": "egwgsw000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "egwgsw00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -22653,7 +22753,7 @@ "id": "erxxdli" } ], - "id": "e09khr2000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e09khr200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -23262,7 +23362,7 @@ "id": "eu9o53q" } ], - "id": "eipn9d00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eipn9d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -23792,7 +23892,7 @@ "id": "ef617zf" } ], - "id": "ebh60il00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ebh60il0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -24563,7 +24663,7 @@ "id": "eak2oy8" } ], - "id": "evgsijp00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "evgsijp0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -28637,7 +28737,7 @@ "id": "e9e5bm" } ], - "id": "e6l31cy000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e6l31cy00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -29458,40 +29558,59 @@ "id": "ek8hrjd" }, { + "key": "proposedOrActualCompletionDate", + "type": "datetime", + "input": true, "label": "Proposed or actual completion date", + "format": "yyyy-MM-dd", "hideInputLabels": false, - "inputsLabelPosition": "top", - "useLocaleSettings": false, + "widget": { + "type": "calendar", + "displayInTimezone": "viewer", + "locale": "en", + "useLocaleSettings": false, + "allowInput": true, + "mode": "single", + "enableTime": false, + "noCalendar": false, + "format": "yyyy-MM-dd", + "hourIncrement": 1, + "minuteIncrement": 1, + "time_24hr": false, + "minDate": null, + "disableWeekends": false, + "disableWeekdays": false, + "maxDate": null + }, + "validate": { + "required": true, + "custom": "", + "customPrivate": false, + "strictDateValidation": false, + "multiple": false, + "unique": false + }, "tableView": false, - "fields": { - "day": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - }, - "month": { - "hide": false, - "required": true, - "type": "select", - "placeholder": "" - }, - "year": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - } + "datePicker": { + "disableWeekdays": false, + "disableWeekends": false, + "showWeeks": true, + "startingDay": 0, + "initDate": "", + "minMode": "day", + "maxMode": "year", + "yearRows": 4, + "yearColumns": 5, + "minDate": null, + "maxDate": null }, - "defaultValue": "00/00/0000", - "key": "proposedOrActualCompletionDate", - "type": "day", - "input": true, + "enableTime": false, "placeholder": "", "prefix": "", "customClass": "", "suffix": "", "multiple": false, + "defaultValue": "", "protected": false, "unique": false, "persistent": true, @@ -29513,17 +29632,8 @@ "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": null, "attributes": {}, "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, "conditional": { "show": null, "when": null, @@ -29543,11 +29653,26 @@ "properties": {}, "allowMultipleMasks": false, "addons": [], - "dayFirst": false, - "id": "eb274z" + "useLocaleSettings": false, + "allowInput": true, + "enableDate": true, + "defaultDate": "", + "displayInTimezone": "viewer", + "timezone": "", + "datepickerMode": "day", + "timePicker": { + "hourStep": 1, + "minuteStep": 1, + "showMeridian": true, + "readonlyInput": false, + "mousewheel": true, + "arrowkeys": true + }, + "customOptions": {}, + "id": "ex2otfp" } ], - "id": "eauzdys00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eauzdys0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -30053,40 +30178,59 @@ "id": "ef329mn" }, { + "key": "groundWaterproposedOrActualCompletionDate", + "type": "datetime", + "input": true, "label": "Proposed or actual completion date", + "format": "yyyy-MM-dd", "hideInputLabels": false, - "inputsLabelPosition": "top", - "useLocaleSettings": false, + "widget": { + "type": "calendar", + "displayInTimezone": "viewer", + "locale": "en", + "useLocaleSettings": false, + "allowInput": true, + "mode": "single", + "enableTime": false, + "noCalendar": false, + "format": "yyyy-MM-dd", + "hourIncrement": 1, + "minuteIncrement": 1, + "time_24hr": false, + "minDate": null, + "disableWeekends": false, + "disableWeekdays": false, + "maxDate": null + }, + "validate": { + "required": true, + "custom": "", + "customPrivate": false, + "strictDateValidation": false, + "multiple": false, + "unique": false + }, "tableView": false, - "fields": { - "day": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - }, - "month": { - "hide": false, - "required": true, - "type": "select", - "placeholder": "" - }, - "year": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - } + "datePicker": { + "disableWeekdays": false, + "disableWeekends": false, + "showWeeks": true, + "startingDay": 0, + "initDate": "", + "minMode": "day", + "maxMode": "year", + "yearRows": 4, + "yearColumns": 5, + "minDate": null, + "maxDate": null }, - "defaultValue": "00/00/0000", - "key": "proposedOrActualCompletionDate", - "type": "day", - "input": true, + "enableTime": false, "placeholder": "", "prefix": "", "customClass": "", "suffix": "", "multiple": false, + "defaultValue": "", "protected": false, "unique": false, "persistent": true, @@ -30108,17 +30252,8 @@ "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": null, "attributes": {}, "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, "conditional": { "show": null, "when": null, @@ -30138,11 +30273,26 @@ "properties": {}, "allowMultipleMasks": false, "addons": [], - "dayFirst": false, - "id": "euj2r2l" + "useLocaleSettings": false, + "allowInput": true, + "enableDate": true, + "defaultDate": "", + "displayInTimezone": "viewer", + "timezone": "", + "datepickerMode": "day", + "timePicker": { + "hourStep": 1, + "minuteStep": 1, + "showMeridian": true, + "readonlyInput": false, + "mousewheel": true, + "arrowkeys": true + }, + "customOptions": {}, + "id": "em3poaa" } ], - "id": "ey0h0vl0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ey0h0vl000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -30648,40 +30798,59 @@ "id": "eyhnsyf" }, { + "key": "surfaceWaterProposedOrActualCompletionDate", + "type": "datetime", + "input": true, "label": "Proposed or actual completion date", + "format": "yyyy-MM-dd", "hideInputLabels": false, - "inputsLabelPosition": "top", - "useLocaleSettings": false, + "widget": { + "type": "calendar", + "displayInTimezone": "viewer", + "locale": "en", + "useLocaleSettings": false, + "allowInput": true, + "mode": "single", + "enableTime": false, + "noCalendar": false, + "format": "yyyy-MM-dd", + "hourIncrement": 1, + "minuteIncrement": 1, + "time_24hr": false, + "minDate": null, + "disableWeekends": false, + "disableWeekdays": false, + "maxDate": null + }, + "validate": { + "required": true, + "custom": "", + "customPrivate": false, + "strictDateValidation": false, + "multiple": false, + "unique": false + }, "tableView": false, - "fields": { - "day": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - }, - "month": { - "hide": false, - "required": true, - "type": "select", - "placeholder": "" - }, - "year": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - } + "datePicker": { + "disableWeekdays": false, + "disableWeekends": false, + "showWeeks": true, + "startingDay": 0, + "initDate": "", + "minMode": "day", + "maxMode": "year", + "yearRows": 4, + "yearColumns": 5, + "minDate": null, + "maxDate": null }, - "defaultValue": "00/00/0000", - "key": "proposedOrActualCompletionDate", - "type": "day", - "input": true, + "enableTime": false, "placeholder": "", "prefix": "", "customClass": "", "suffix": "", "multiple": false, + "defaultValue": "", "protected": false, "unique": false, "persistent": true, @@ -30703,17 +30872,8 @@ "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": null, "attributes": {}, "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, "conditional": { "show": null, "when": null, @@ -30733,11 +30893,26 @@ "properties": {}, "allowMultipleMasks": false, "addons": [], - "dayFirst": false, - "id": "ehez7s" + "useLocaleSettings": false, + "allowInput": true, + "enableDate": true, + "defaultDate": "", + "displayInTimezone": "viewer", + "timezone": "", + "datepickerMode": "day", + "timePicker": { + "hourStep": 1, + "minuteStep": 1, + "showMeridian": true, + "readonlyInput": false, + "mousewheel": true, + "arrowkeys": true + }, + "customOptions": {}, + "id": "ebu3n7" } ], - "id": "el9aclo000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "el9aclo00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -31243,40 +31418,59 @@ "id": "e86fmgcc" }, { + "key": "vapourProposedOrActualCompletionDate", + "type": "datetime", + "input": true, "label": "Proposed or actual completion date", + "format": "yyyy-MM-dd", "hideInputLabels": false, - "inputsLabelPosition": "top", - "useLocaleSettings": false, + "widget": { + "type": "calendar", + "displayInTimezone": "viewer", + "locale": "en", + "useLocaleSettings": false, + "allowInput": true, + "mode": "single", + "enableTime": false, + "noCalendar": false, + "format": "yyyy-MM-dd", + "hourIncrement": 1, + "minuteIncrement": 1, + "time_24hr": false, + "minDate": null, + "disableWeekends": false, + "disableWeekdays": false, + "maxDate": null + }, + "validate": { + "required": true, + "custom": "", + "customPrivate": false, + "strictDateValidation": false, + "multiple": false, + "unique": false + }, "tableView": false, - "fields": { - "day": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - }, - "month": { - "hide": false, - "required": true, - "type": "select", - "placeholder": "" - }, - "year": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - } + "datePicker": { + "disableWeekdays": false, + "disableWeekends": false, + "showWeeks": true, + "startingDay": 0, + "initDate": "", + "minMode": "day", + "maxMode": "year", + "yearRows": 4, + "yearColumns": 5, + "minDate": null, + "maxDate": null }, - "defaultValue": "00/00/0000", - "key": "proposedOrActualCompletionDate", - "type": "day", - "input": true, + "enableTime": false, "placeholder": "", "prefix": "", "customClass": "", "suffix": "", "multiple": false, + "defaultValue": "", "protected": false, "unique": false, "persistent": true, @@ -31298,17 +31492,8 @@ "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": null, "attributes": {}, "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, "conditional": { "show": null, "when": null, @@ -31328,11 +31513,26 @@ "properties": {}, "allowMultipleMasks": false, "addons": [], - "dayFirst": false, - "id": "et10s3fg" + "useLocaleSettings": false, + "allowInput": true, + "enableDate": true, + "defaultDate": "", + "displayInTimezone": "viewer", + "timezone": "", + "datepickerMode": "day", + "timePicker": { + "hourStep": 1, + "minuteStep": 1, + "showMeridian": true, + "readonlyInput": false, + "mousewheel": true, + "arrowkeys": true + }, + "customOptions": {}, + "id": "eincm2l" } ], - "id": "ehk7lsj00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ehk7lsj0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -31838,40 +32038,59 @@ "id": "ek6jihq" }, { + "key": "sedimentProposedOrActualCompletionDate", + "type": "datetime", + "input": true, "label": "Proposed or actual completion date", + "format": "yyyy-MM-dd", "hideInputLabels": false, - "inputsLabelPosition": "top", - "useLocaleSettings": false, + "widget": { + "type": "calendar", + "displayInTimezone": "viewer", + "locale": "en", + "useLocaleSettings": false, + "allowInput": true, + "mode": "single", + "enableTime": false, + "noCalendar": false, + "format": "yyyy-MM-dd", + "hourIncrement": 1, + "minuteIncrement": 1, + "time_24hr": false, + "minDate": null, + "disableWeekends": false, + "disableWeekdays": false, + "maxDate": null + }, + "validate": { + "required": true, + "custom": "", + "customPrivate": false, + "strictDateValidation": false, + "multiple": false, + "unique": false + }, "tableView": false, - "fields": { - "day": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - }, - "month": { - "hide": false, - "required": true, - "type": "select", - "placeholder": "" - }, - "year": { - "hide": false, - "required": true, - "type": "number", - "placeholder": "" - } + "datePicker": { + "disableWeekdays": false, + "disableWeekends": false, + "showWeeks": true, + "startingDay": 0, + "initDate": "", + "minMode": "day", + "maxMode": "year", + "yearRows": 4, + "yearColumns": 5, + "minDate": null, + "maxDate": null }, - "defaultValue": "00/00/0000", - "key": "proposedOrActualCompletionDate", - "type": "day", - "input": true, + "enableTime": false, "placeholder": "", "prefix": "", "customClass": "", "suffix": "", "multiple": false, + "defaultValue": "", "protected": false, "unique": false, "persistent": true, @@ -31893,17 +32112,8 @@ "customDefaultValue": "", "calculateValue": "", "calculateServer": false, - "widget": null, "attributes": {}, "validateOn": "change", - "validate": { - "required": false, - "custom": "", - "customPrivate": false, - "strictDateValidation": false, - "multiple": false, - "unique": false - }, "conditional": { "show": null, "when": null, @@ -31923,11 +32133,26 @@ "properties": {}, "allowMultipleMasks": false, "addons": [], - "dayFirst": false, - "id": "eu50tno" + "useLocaleSettings": false, + "allowInput": true, + "enableDate": true, + "defaultDate": "", + "displayInTimezone": "viewer", + "timezone": "", + "datepickerMode": "day", + "timePicker": { + "hourStep": 1, + "minuteStep": 1, + "showMeridian": true, + "readonlyInput": false, + "mousewheel": true, + "arrowkeys": true + }, + "customOptions": {}, + "id": "elx2wbn" } ], - "id": "ejahpfm00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ejahpfm0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -32633,7 +32858,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "etzpsl00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "id": "etzpsl0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ], "placeholder": "", @@ -33374,7 +33599,7 @@ "defaultValue": "" } ], - "id": "esvz3la000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esvz3la00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -37327,7 +37552,7 @@ "id": "estazfs" } ], - "id": "ef5nwt000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ef5nwt00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -37833,7 +38058,7 @@ "id": "eq5jxk" } ], - "id": "eoq12ev00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eoq12ev0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -38152,7 +38377,7 @@ "id": "enjn8bkh" } ], - "id": "ett43n0j0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ett43n0j000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -38471,7 +38696,7 @@ "id": "ee9w9ok" } ], - "id": "euuaaa000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "euuaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -38790,7 +39015,7 @@ "id": "e6efm7o" } ], - "id": "edr4h0500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "edr4h050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -40901,7 +41126,7 @@ "type": "columns", "input": false, "tableView": false, - "id": "ev4kpmc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ev4kpmc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -41698,7 +41923,7 @@ "type": "columns", "input": false, "tableView": false, - "id": "ehbime000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ehbime00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -42606,7 +42831,7 @@ "refreshOn": "", "addons": [], "inputType": "text", - "id": "errpqaf0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "errpqaf000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "defaultValue": "" } ], From 207ad450eca43e84e5694b6434f2b93bc6303db7 Mon Sep 17 00:00:00 2001 From: midhun-aot Date: Wed, 15 Nov 2023 14:04:15 -0800 Subject: [PATCH 32/35] Fixed site-owner not able to submit form --- .../epd-forms/Summary of Site Condition.json | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/forms-flow-ai/epd-forms/Summary of Site Condition.json b/forms-flow-ai/epd-forms/Summary of Site Condition.json index d251f6f8..f7fe10b1 100644 --- a/forms-flow-ai/epd-forms/Summary of Site Condition.json +++ b/forms-flow-ai/epd-forms/Summary of Site Condition.json @@ -8670,7 +8670,7 @@ "id": "ej1mdrb" } ], - "id": "ej7yhy00000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ej7yhy00000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -9710,7 +9710,7 @@ "id": "eqnyhh" } ], - "id": "eskogm00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eskogm00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -10242,7 +10242,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "e0cqfrg00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "id": "e0cqfrg00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ], "layoutFixed": false, @@ -10341,7 +10341,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "elizdoh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "elizdoh00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -11789,7 +11789,7 @@ "id": "e6o3au0o" } ], - "id": "erlwlrl000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "erlwlrl000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -12822,7 +12822,7 @@ "id": "eg4rrls" } ], - "id": "ehjtgz0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ehjtgz0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -13421,7 +13421,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "emjblk60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "id": "emjblk60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ], "placeholder": "", @@ -13465,7 +13465,7 @@ "input": true, "label": "Crown Land File Numbers", "tableView": true, - "id": "eh8kmqu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eh8kmqu00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -14414,7 +14414,7 @@ "id": "edt3c4" } ], - "id": "e80y9k80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e80y9k80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -21956,7 +21956,7 @@ "id": "es5kcwo" } ], - "id": "egwgsw00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "egwgsw00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -22753,7 +22753,7 @@ "id": "erxxdli" } ], - "id": "e09khr200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e09khr200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -23362,7 +23362,7 @@ "id": "eu9o53q" } ], - "id": "eipn9d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eipn9d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -23892,7 +23892,7 @@ "id": "ef617zf" } ], - "id": "ebh60il0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ebh60il0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -24663,7 +24663,7 @@ "id": "eak2oy8" } ], - "id": "evgsijp0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "evgsijp0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -28737,7 +28737,7 @@ "id": "e9e5bm" } ], - "id": "e6l31cy00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "e6l31cy00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -29672,7 +29672,7 @@ "id": "ex2otfp" } ], - "id": "eauzdys0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eauzdys0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -30292,7 +30292,7 @@ "id": "em3poaa" } ], - "id": "ey0h0vl000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ey0h0vl000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -30912,7 +30912,7 @@ "id": "ebu3n7" } ], - "id": "el9aclo00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "el9aclo00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -31532,7 +31532,7 @@ "id": "eincm2l" } ], - "id": "ehk7lsj0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ehk7lsj0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -32152,7 +32152,7 @@ "id": "elx2wbn" } ], - "id": "ejahpfm0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ejahpfm0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -32858,7 +32858,7 @@ "addons": [], "tree": false, "lazyLoad": false, - "id": "etzpsl0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + "id": "etzpsl0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" } ], "placeholder": "", @@ -33599,7 +33599,7 @@ "defaultValue": "" } ], - "id": "esvz3la00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "esvz3la00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -37552,7 +37552,7 @@ "id": "estazfs" } ], - "id": "ef5nwt00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ef5nwt00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -38058,7 +38058,7 @@ "id": "eq5jxk" } ], - "id": "eoq12ev0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "eoq12ev0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -38377,7 +38377,7 @@ "id": "enjn8bkh" } ], - "id": "ett43n0j000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ett43n0j000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -38696,7 +38696,7 @@ "id": "ee9w9ok" } ], - "id": "euuaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "euuaaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -39015,7 +39015,7 @@ "id": "e6efm7o" } ], - "id": "edr4h050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "edr4h050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -41126,7 +41126,7 @@ "type": "columns", "input": false, "tableView": false, - "id": "ev4kpmc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ev4kpmc000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -41923,7 +41923,7 @@ "type": "columns", "input": false, "tableView": false, - "id": "ehbime00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "ehbime00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "placeholder": "", "prefix": "", "customClass": "", @@ -42831,7 +42831,7 @@ "refreshOn": "", "addons": [], "inputType": "text", - "id": "errpqaf000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "id": "errpqaf000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", "defaultValue": "" } ], @@ -44364,7 +44364,7 @@ "eq": "", "json": "" }, - "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\r\nconst roles = UserDetails[\"role\"];\r\nif(roles.includes(\"formsflow-client\")) {\r\n show = true;\r\n}\r\nelse\r\n{\r\n show = false;\r\n}", + "customConditional": "const UserDetails = JSON.parse(localStorage.getItem(\"UserDetails\"));\nconst roles = UserDetails[\"role\"];\nif(roles.includes(\"formsflow-client\")||roles.includes(\"formsflow-reviewer/formsflow-client-reviewer\") ) {\n show = true;\n}\nelse\n{\n show = false;\n}", "logic": [], "attributes": {}, "overlay": { @@ -44415,7 +44415,7 @@ "showWordCount": false, "allowMultipleMasks": false, "addons": [], - "id": "eh150x" + "id": "el00fud" }, { "label": "bundleStatus", From bdbd216f141f18f0a8c68205b45b570abf4e386f Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Thu, 16 Nov 2023 11:52:35 -0800 Subject: [PATCH 33/35] removed unused routes --- .../templates/etl/debezium-kafka.deploy.yaml | 19 ------------------- .../etl/debezium-postgis.deploy.yaml | 19 ------------------- .../etl/debezium-zookeeper.deploy.yaml | 19 ------------------- 3 files changed, 57 deletions(-) diff --git a/openshift/templates/etl/debezium-kafka.deploy.yaml b/openshift/templates/etl/debezium-kafka.deploy.yaml index 4cb4bc7f..5fc8c37b 100644 --- a/openshift/templates/etl/debezium-kafka.deploy.yaml +++ b/openshift/templates/etl/debezium-kafka.deploy.yaml @@ -86,25 +86,6 @@ objects: sessionAffinity: None # status: # loadBalancer: {} -- kind: Route - apiVersion: v1 - metadata: - name: "${API_NAME}" - labels: - app: "${API_NAME}" - app-group: "${APP_GROUP}" - template: "${API_NAME}-deploy" - spec: - to: - kind: Service - name: "${API_NAME}" - weight: 100 - port: - targetPort: 9092-tcp - tls: - termination: edge - wildcardPolicy: None - host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" parameters: - name: API_NAME displayName: Name diff --git a/openshift/templates/etl/debezium-postgis.deploy.yaml b/openshift/templates/etl/debezium-postgis.deploy.yaml index d56656c3..c50e254f 100644 --- a/openshift/templates/etl/debezium-postgis.deploy.yaml +++ b/openshift/templates/etl/debezium-postgis.deploy.yaml @@ -114,25 +114,6 @@ objects: sessionAffinity: None # status: # loadBalancer: {} -- kind: Route - apiVersion: v1 - metadata: - name: "${API_NAME}" - labels: - app: "${API_NAME}" - app-group: "${APP_GROUP}" - template: "${API_NAME}-deploy" - spec: - to: - kind: Service - name: "${API_NAME}" - weight: 100 - port: - targetPort: 5432-tcp - tls: - termination: edge - wildcardPolicy: None - host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" parameters: - name: API_NAME displayName: Name diff --git a/openshift/templates/etl/debezium-zookeeper.deploy.yaml b/openshift/templates/etl/debezium-zookeeper.deploy.yaml index 9d4bb609..6ac5e449 100644 --- a/openshift/templates/etl/debezium-zookeeper.deploy.yaml +++ b/openshift/templates/etl/debezium-zookeeper.deploy.yaml @@ -87,25 +87,6 @@ objects: sessionAffinity: None # status: # loadBalancer: {} -- kind: Route - apiVersion: v1 - metadata: - name: "${API_NAME}" - labels: - app: "${API_NAME}" - app-group: "${APP_GROUP}" - template: "${API_NAME}-deploy" - spec: - to: - kind: Service - name: "${API_NAME}" - weight: 100 - port: - targetPort: 2181-tcp - tls: - termination: edge - wildcardPolicy: None - host: "${API_NAME}-${TAG_NAME}.apps.silver.devops.gov.bc.ca" parameters: - name: API_NAME displayName: Name From 810b4c7744ed938189d25bf8296ed2338e51bc07 Mon Sep 17 00:00:00 2001 From: jaise-aot Date: Thu, 16 Nov 2023 12:21:43 -0800 Subject: [PATCH 34/35] cleanup build time files --- .../target/classes/META-INF/MANIFEST.MF | 5 -- .../pom.properties | 7 -- .../kafka-connect-debezium-transforms/pom.xml | 81 ------------------- 3 files changed, 93 deletions(-) delete mode 100644 etl/debezium-jdbc/target/classes/META-INF/MANIFEST.MF delete mode 100644 etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.properties delete mode 100644 etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.xml diff --git a/etl/debezium-jdbc/target/classes/META-INF/MANIFEST.MF b/etl/debezium-jdbc/target/classes/META-INF/MANIFEST.MF deleted file mode 100644 index c1f9f30c..00000000 --- a/etl/debezium-jdbc/target/classes/META-INF/MANIFEST.MF +++ /dev/null @@ -1,5 +0,0 @@ -Manifest-Version: 1.0 -Built-By: JaiseT -Build-Jdk: 17.0.5 -Created-By: Maven Integration for Eclipse - diff --git a/etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.properties b/etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.properties deleted file mode 100644 index c0b58698..00000000 --- a/etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.properties +++ /dev/null @@ -1,7 +0,0 @@ -#Generated by Maven Integration for Eclipse -#Thu Jun 01 11:00:04 PDT 2023 -m2e.projectLocation=C\:\\Users\\JaiseT\\Documents\\EPD\\nr-epd-digital-services\\backend\\etl\\debezium-jdbc -m2e.projectName=kafka-connect-debezium-transforms -groupId=ca.bc.gov.nr-epd -artifactId=kafka-connect-debezium-transforms -version=1.0-SNAPSHOT diff --git a/etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.xml b/etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.xml deleted file mode 100644 index cca86583..00000000 --- a/etl/debezium-jdbc/target/classes/META-INF/maven/ca.bc.gov.nr-epd/kafka-connect-debezium-transforms/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - 4.0.0 - - ca.bc.gov.nr-epd - kafka-connect-debezium-transforms - 1.0-SNAPSHOT - - kafka-connect-debezium-transforms - - - UTF-8 - - - - - org.apache.kafka - connect-transforms - 3.2.1 - provided - - - - - - - - - maven-clean-plugin - 3.1.0 - - - - maven-resources-plugin - 3.0.2 - - - maven-compiler-plugin - 3.8.0 - - - maven-surefire-plugin - 2.22.1 - - - maven-jar-plugin - 3.0.2 - - - maven-install-plugin - 2.5.2 - - - maven-deploy-plugin - 2.8.2 - - - - maven-site-plugin - 3.7.1 - - - maven-project-info-reports-plugin - 3.0.0 - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 8 - 8 - - - - - \ No newline at end of file From e92408161d3e09905e9db451bc04acd4086e8318 Mon Sep 17 00:00:00 2001 From: eric-bcps <149617222+eric-bcps@users.noreply.github.com> Date: Thu, 16 Nov 2023 12:34:08 -0800 Subject: [PATCH 35/35] fix: use i18next's hook to fetch translated content (#574) --- .../forms-flow-web/src/components/Form/constants/FormTable.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/forms-flow-ai/forms-flow-ai-ee/forms-flow-web/src/components/Form/constants/FormTable.js b/forms-flow-ai/forms-flow-ai-ee/forms-flow-web/src/components/Form/constants/FormTable.js index a132a117..dd18e63e 100644 --- a/forms-flow-ai/forms-flow-ai-ee/forms-flow-web/src/components/Form/constants/FormTable.js +++ b/forms-flow-ai/forms-flow-ai-ee/forms-flow-web/src/components/Form/constants/FormTable.js @@ -20,7 +20,7 @@ import SelectFormForDownload from "../FileUpload/SelectFormForDownload"; import LoadingOverlay from "react-loading-overlay"; import { STAFF_DESIGNER } from "../../../constants/constants"; import { getBundle } from "../../../apiManager/services/bundleServices"; -import { t } from "i18next"; +import { useTranslation } from "react-i18next"; import { TYPE_BUNDLE } from "../../../constants/applicationConstants"; function FormTable() { @@ -43,6 +43,7 @@ function FormTable() { const [search, setSearch] = useState(searchText || ""); const [bundleData, setBundleData] = useState([]); const [selectedRow, setSelectedRow] = useState(null); + const { t } = useTranslation(); const pageOptions = [ {