Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge dev into main #412

Merged
merged 99 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
ad22b95
SDS Form fixes
RyanBirtch-aot Jun 15, 2023
25d650c
Merge branch 'dev' into sds-form-fixes
RyanBirtch-aot Jun 15, 2023
a78a263
SIR workflow and common email workflow
jaise-aot Jun 19, 2023
3ea90ac
updated with latest changes from chefs
nikhila-aot Jun 20, 2023
26ee123
Merge pull request #388 from bcgov/feat/task-160
midhun-aot Jun 20, 2023
f860989
Fixed Conditional issue and inspected for CHEFS housing fields
RyanBirtch-aot Jun 20, 2023
81a32e0
Merge Fixes
RyanBirtch-aot Jun 21, 2023
70c78e5
updating latest srcr form
midhun-aot Jun 21, 2023
9d26d01
Merge pull request #389 from bcgov/sds-form-fixes
nikhila-aot Jun 21, 2023
64232ac
Merge pull request #390 from bcgov/latest-srcr-form
nikhila-aot Jun 21, 2023
9680e35
added srcr section
nikhila-aot Jun 22, 2023
795d87c
Merge pull request #391 from bcgov/feat/task-157
midhun-aot Jun 22, 2023
06d962b
latest chagnes for SDS form and workflow
midhun-aot Jun 22, 2023
20956ee
task-171 workflow changes
jaise-aot Jun 22, 2023
c41c703
merging dev
midhun-aot Jun 23, 2023
e25ecf1
Merge pull request #392 from bcgov/sds-latest-fixes
nikhila-aot Jun 23, 2023
b14b93f
sir form updates
jaise-aot Jun 23, 2023
bf40834
gave flow name:
nikhila-aot Jun 26, 2023
b102fdb
Merge pull request #393 from bcgov/feat/task-171
nikhila-aot Jun 26, 2023
09948eb
disable notes for client user
jaise-aot Jun 27, 2023
3c045a3
added logic to disable form content based on user groups
midhun-aot Jun 27, 2023
d26afa8
Merge pull request #394 from bcgov/diable-form-conent
nikhila-aot Jun 27, 2023
2e532de
adding chagnes for cssa sharing
midhun-aot Jun 28, 2023
d11e627
Merge branch 'dev' into sharing-cssa-form-workflow
midhun-aot Jun 28, 2023
7e4b321
add javascript null checks
midhun-aot Jun 29, 2023
c2b98a4
adding names to controls in workflow
midhun-aot Jul 5, 2023
72848d4
Merge pull request #395 from bcgov/sharing-cssa-form-workflow
nikhila-aot Jul 6, 2023
1744fac
changes for map component
jaise-aot Jul 6, 2023
6e2305a
NIR worfkflow
jaise-aot Jul 6, 2023
4ee3960
added notes and reviewer actions to NIR form
jaise-aot Jul 6, 2023
813fe8f
Added completed form
RyanBirtch-aot Jul 6, 2023
cf60978
NOM workflow initial draft
jaise-aot Jul 6, 2023
04ebf9c
Merge pull request #396 from bcgov/feat/task-171
nikhila-aot Jul 7, 2023
28c51a7
bundle workflow and forms initial draft
nikhila-aot Jul 7, 2023
0424de1
Merge branch 'dev' into SOSC-form-completion
RyanBirtch-aot Jul 7, 2023
f074416
handled society flows
nikhila-aot Jul 7, 2023
edd5aab
NOM workflow and form changes
jaise-aot Jul 10, 2023
0c90981
issue fix for rejection, email integration and form changes
nikhila-aot Jul 10, 2023
977c9ac
Ss 109 configmap (#400)
sakthi-aot Jul 12, 2023
589fb4f
integrating formsflow ee chagnes
midhun-aot Jul 13, 2023
45b23ef
changes for resubmit
nikhila-aot Jul 13, 2023
fc39e2d
changed form title and notes api key
nikhila-aot Jul 13, 2023
36ee68b
changed workflow name
nikhila-aot Jul 13, 2023
94dd38d
Merge pull request #397 from bcgov/feat/task-177
nikhila-aot Jul 13, 2023
9deafa5
changed notes api key and workflow process name
nikhila-aot Jul 13, 2023
a500a68
Merge pull request #399 from bcgov/feat/task-181
nikhila-aot Jul 13, 2023
1d4a920
add nav style chagnes
midhun-aot Jul 13, 2023
eaf29b4
inital fixes for resubmission
nikhila-aot Jul 17, 2023
e2d9ea1
fixed ap flow issues
nikhila-aot Jul 17, 2023
379e522
adding themes app for formsflow-ee
midhun-aot Jul 17, 2023
a35a081
Form fixes
RyanBirtch-aot Jul 17, 2023
9ff9203
fixed submissions for sdm
nikhila-aot Jul 18, 2023
7710a48
fixed caseworker resubmit
nikhila-aot Jul 18, 2023
cceaa35
changes for srcr resubmit
nikhila-aot Jul 18, 2023
aa666b0
changes for incorrect final status
nikhila-aot Jul 18, 2023
44ae0a2
issue with cssa completing first
nikhila-aot Jul 18, 2023
013eae7
fixed reject scenarios
nikhila-aot Jul 19, 2023
7a86ce8
latest chagnes
midhun-aot Jul 19, 2023
0d68b1e
changes for custom web
midhun-aot Jul 19, 2023
c1c7a93
latest chagnes
midhun-aot Jul 20, 2023
4dd6cfa
changes for bundling
nikhila-aot Jul 20, 2023
93503e7
deleted folder
midhun-aot Jul 20, 2023
146dda8
Fixing map component
midhun-aot Jul 20, 2023
0a3ccd1
fixed alternatng resubmit issue
nikhila-aot Jul 21, 2023
93bb82f
corrected folder structure
nikhila-aot Jul 21, 2023
f715d08
Merge pull request #402 from bcgov/feat/task-185
midhun-aot Jul 21, 2023
4aab5e7
adding config template file
midhun-aot Jul 21, 2023
509111e
Merge pull request #403 from bcgov/formsflow-ee-integration
nikhila-aot Jul 21, 2023
8eb35b7
Update gitignore
acoard-aot Jul 24, 2023
cef9f2c
Copied over dockerfile and readme
acoard-aot Jul 24, 2023
05933b9
Updated dockerfile to use branch epd-ff-ee-5.2.0
acoard-aot Jul 24, 2023
a738160
Added branch info
acoard-aot Jul 24, 2023
57ef742
Update readmes
acoard-aot Jul 24, 2023
f77ade0
Manually vendor forms-flow-nav and forms-flow-theme
acoard-aot Jul 24, 2023
2ae49b6
Did `git rm --cached map-packages` after submodule error
acoard-aot Jul 24, 2023
1e3fd39
Created build/deploy yaml for forms-flow-web-root-config
acoard-aot Jul 24, 2023
f68e34b
Renamed folder to root-config
acoard-aot Jul 24, 2023
85d0e1b
Build configs for forms-flow-nav and forms-flow-theme
acoard-aot Jul 24, 2023
437762e
Nav and theme deploy yaml
acoard-aot Jul 24, 2023
b8c92ec
Updated various nginx to identify which one is mistakenly copied into…
acoard-aot Jul 24, 2023
4a575b7
Set root envs in both build and deploy for sanity test
acoard-aot Jul 24, 2023
d8ef24c
Added config.js to root-config-deploy
acoard-aot Jul 25, 2023
c8846da
Changed build branch from `dev-docker-ee` to `dev`
acoard-aot Jul 25, 2023
9561350
Merge pull request #398 from bcgov/SOSC-form-completion
nikhila-aot Jul 25, 2023
e6c4973
workflow changes for form sharing
nikhila-aot Jul 25, 2023
0fbaa06
form changes for bundling
nikhila-aot Jul 25, 2023
06ea421
Merge pull request #405 from bcgov/feat/task-261
midhun-aot Jul 25, 2023
6e2f24c
updated javascript
midhun-aot Jul 25, 2023
94b378f
Merge pull request #404 from bcgov/dev-docker-ee
RyanBirtch-aot Jul 25, 2023
9cb6403
Merge pull request #406 from bcgov/fixing-notes-issue
nikhila-aot Jul 25, 2023
89662c6
fix for EPDDS-208
midhun-aot Jul 26, 2023
c9344fb
Merge pull request #408 from bcgov/EPDDS-208
nikhila-aot Jul 26, 2023
216f930
Revert "updated javascript"
midhun-aot Jul 26, 2023
b265d78
Merge pull request #410 from bcgov/revert-406-fixing-notes-issue
nikhila-aot Jul 26, 2023
db46a5f
latest bundle form changes
midhun-aot Jul 26, 2023
f71f266
Merge pull request #411 from bcgov/fix-form-custom-submission
nikhila-aot Jul 27, 2023
4a3f891
Manually resolve merge conflict between main and dev
acoard-aot Jul 27, 2023
64cb836
Merge branch 'dev' into dev-mergeconflict
acoard-aot Jul 27, 2023
fdc0744
Merge pull request #413 from bcgov/dev-mergeconflict
acoard-aot Jul 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
id_rsa_ff_ee

# Logs
logs
*.log
Expand Down Expand Up @@ -118,3 +120,6 @@ backend/etl/debezium-jdbc/.settings/org.eclipse.core.resources.prefs
backend/etl/debezium-jdbc/.project
backend/etl/debezium-jdbc/.classpath
backend/etl/debezium-jdbc/target/


notes/
1 change: 1 addition & 0 deletions forms-flow-ai/epd-forms/Summary of Site Condition.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

107 changes: 107 additions & 0 deletions forms-flow-ai/forms-flow-ai-ee/forms-flow-web-root-config/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
# Base image
FROM node:14.17.6-alpine as build-stage

# Set working directory
WORKDIR /forms-flow-web-root-config/app

# Set build arguments
ARG NODE_ENV
ARG MF_FORMSFLOW_WEB_URL
ARG MF_FORMSFLOW_NAV_URL
ARG MF_FORMSFLOW_SERVICE_URL
ARG MF_FORMSFLOW_ADMIN_URL
ARG MF_FORMSFLOW_THEME_URL
ARG REACT_APP_CUSTOM_LOGOUT_URL
ARG REACT_APP_CUSTOM_MAP_URL
ARG ssh_prv_key
ARG ssh_pub_key

# Set environment variables
ENV MF_FORMSFLOW_WEB_URL ${MF_FORMSFLOW_WEB_URL}
ENV MF_FORMSFLOW_NAV_URL ${MF_FORMSFLOW_NAV_URL}
ENV MF_FORMSFLOW_SERVICE_URL ${MF_FORMSFLOW_SERVICE_URL}
ENV MF_FORMSFLOW_ADMIN_URL ${MF_FORMSFLOW_ADMIN_URL}
ENV MF_FORMSFLOW_THEME_URL ${MF_FORMSFLOW_THEME_URL}
ENV NODE_ENV ${NODE_ENV}
ENV REACT_APP_CUSTOM_LOGOUT_URL ${REACT_APP_CUSTOM_LOGOUT_URL}
ENV REACT_APP_CUSTOM_MAP_URL ${REACT_APP_CUSTOM_MAP_URL}

# Add `/app/node_modules/.bin` to $PATH
ENV PATH /forms-flow-web-root-config/app/node_modules/.bin:$PATH

# Install necessary packages
RUN apk update && apk upgrade && \
apk add --no-cache bash git openssh

# Install and cache app dependencies
COPY package-lock.json /forms-flow-web-root-config/app/package-lock.json
COPY package.json /forms-flow-web-root-config/app/package.json
COPY env.sh /forms-flow-web-root-config/app/env.sh
RUN npm ci --only=production

# Copy source code
# COPY . /forms-flow-web-root-config/app/

# Authorize SSH Host
RUN mkdir -p /root/.ssh && \
chmod 0700 /root/.ssh && \
echo " IdentityFile ~/.ssh/id_rsa" >> /etc/ssh/ssh_config

RUN echo "$ssh_prv_key" | sed 's/\\n/\n/g' > /root/.ssh/id_rsa && \
echo "$ssh_pub_key" | sed 's/\\n/\n/g' > /root/.ssh/id_rsa.pub && \
chmod 600 /root/.ssh/id_rsa && \
chmod 600 /root/.ssh/id_rsa.pub

RUN mkdir -p /root/.ssh && ssh-keyscan github.com >> /root/.ssh/known_hosts

RUN git clone [email protected]:AOT-Technologies/forms-flow-ai-ee.git -b epd-ff-ee-5.2.0 /tmp/forms-flow-ai/

RUN cp -r /tmp/forms-flow-ai/forms-flow-web-root-config/. /forms-flow-web-root-config/app


# Customizations
ARG CUSTOM_SRC_DIR=src
COPY ./ /tmp/${CUSTOM_SRC_DIR}/
RUN cp -R /tmp/${CUSTOM_SRC_DIR}/* /forms-flow-web-root-config/app/ && rm -Rf /tmp/${CUSTOM_SRC_DIR}

ARG CUSTOM_SRC_DIR=public
COPY ./ /tmp/${CUSTOM_SRC_DIR}/
RUN cp -R /tmp/${CUSTOM_SRC_DIR}/* /forms-flow-web-root-config/app/ && rm -Rf /tmp/${CUSTOM_SRC_DIR}/

# Build the application
RUN if [ $NODE_ENV == "development" ]; then \
npm run build-dev:webpack; \
else \
npm run build:webpack; \
fi


# Production stage
FROM nginx:1.25.1-alpine as production-stage

# Set label for image
LABEL Name="formsflow"

# Create directories
RUN mkdir /app
WORKDIR /usr/share/nginx/html/config

# Copy built files from build stage
COPY --from=build-stage /forms-flow-web-root-config/app/dist /usr/share/nginx/html
COPY --from=build-stage /forms-flow-web-root-config/app/env.sh /usr/share/nginx/html/config

# Copy nginx configuration
COPY nginx.conf /etc/nginx/nginx.conf

# Expose port
EXPOSE 8080

# Install necessary packages
RUN apk add --no-cache bash

# Set execute permission for env.sh
RUN chmod +x /usr/share/nginx/html/config/env.sh

# Start Nginx server with environment setup
CMD ["/bin/bash", "-c", "nginx -g \"daemon off;\""]
# CMD ["/bin/bash", "-c", "/usr/share/nginx/html/config/env.sh && nginx -g \"daemon off;\""]
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
services:
forms-flow-web-root-config:
container_name: forms-flow-web-root-config
build:
context: .
dockerfile: Dockerfile
args:
- MF_FORMSFLOW_WEB_URL=${MF_FORMSFLOW_WEB_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected]/forms-flow-web.gz.js}
- MF_FORMSFLOW_NAV_URL=${MF_FORMSFLOW_NAV_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected]/forms-flow-nav.gz.js}
- MF_FORMSFLOW_SERVICE_URL=${MF_FORMSFLOW_SERVICE_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected]/forms-flow-service.gz.js}
- MF_FORMSFLOW_ADMIN_URL=${MF_FORMSFLOW_ADMIN_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected]/forms-flow-admin.gz.js}
- MF_FORMSFLOW_THEME_URL=${MF_FORMSFLOW_THEME_URL:-https://forms-flow-microfrontends.aot-technologies.com/[email protected]/forms-flow-theme.gz.js}
- NODE_ENV=${NODE_ENV:-production}
entrypoint: /bin/sh -c "/usr/share/nginx/html/config/env.sh && nginx -g 'daemon off;'"
environment:
- NODE_ENV=${NODE_ENV:-production}
- REACT_APP_API_SERVER_URL=${FORMIO_DEFAULT_PROJECT_URL}
- REACT_APP_API_PROJECT_URL=${FORMIO_DEFAULT_PROJECT_URL}
- REACT_APP_KEYCLOAK_CLIENT=${KEYCLOAK_WEB_CLIENT_ID:-forms-flow-web}
- REACT_APP_WEB_BASE_URL=${FORMSFLOW_API_URL}
- REACT_APP_BPM_URL=${BPM_API_URL}
- REACT_APP_WEBSOCKET_ENCRYPT_KEY=${WEBSOCKET_ENCRYPT_KEY:-giert989jkwrgb@DR55}
- REACT_APP_KEYCLOAK_URL_REALM=${KEYCLOAK_URL_REALM:-forms-flow-ai}
- REACT_APP_KEYCLOAK_URL=${KEYCLOAK_URL}
- REACT_APP_APPLICATION_NAME=${APPLICATION_NAME:-formsflow.ai}
- REACT_APP_ENABLE_APPLICATION_ACCESS_PERMISSION_CHECK=${ENABLE_APPLICATION_ACCESS_PERMISSION_CHECK:-false}
- REACT_APP_WEB_BASE_CUSTOM_URL=${WEB_BASE_CUSTOM_URL}
- REACT_APP_MULTI_TENANCY_ENABLED=${MULTI_TENANCY_ENABLED:-false}
- REACT_APP_MT_ADMIN_BASE_URL=${MT_ADMIN_BASE_URL}
- REACT_APP_MT_ADMIN_BASE_URL_VERSION=${MT_ADMIN_BASE_URL_VERSION}
- REACT_APP_CUSTOM_SUBMISSION_URL=${CUSTOM_SUBMISSION_URL}
- REACT_APP_CUSTOM_SUBMISSION_ENABLED=${CUSTOM_SUBMISSION_ENABLED:-false}
- REACT_APP_DRAFT_ENABLED=${DRAFT_ENABLED:-false}
- REACT_APP_DRAFT_POLLING_RATE=${DRAFT_POLLING_RATE:-15000}
- REACT_APP_EXPORT_PDF_ENABLED=${EXPORT_PDF_ENABLED:-false}
- REACT_APP_PUBLIC_WORKFLOW_ENABLED=${PUBLIC_WORKFLOW_ENABLED:-false}
- REACT_APP_DOCUMENT_SERVICE_URL=${DOCUMENT_SERVICE_URL}
- REACT_APP_CUSTOM_THEME_URL=${CUSTOM_THEME_URL}
- REACT_APP_CUSTOM_RESOURCE_BUNDLE_URL=${CUSTOM_RESOURCE_BUNDLE_URL}
- REACT_APP_KEYCLOAK_ENABLE_CLIENT_AUTH=${KEYCLOAK_ENABLE_CLIENT_AUTH:-false}
- REACT_APP_ENABLE_FORMS_MODULE=${ENABLE_FORMS_MODULE:-true}
- REACT_APP_ENABLE_TASKS_MODULE=${ENABLE_TASKS_MODULE:-true}
- REACT_APP_ENABLE_DASHBOARDS_MODULE=${ENABLE_DASHBOARDS_MODULE:-true}
- REACT_APP_ENABLE_PROCESSES_MODULE=${ENABLE_PROCESSES_MODULE:-true}
- REACT_APP_ENABLE_APPLICATIONS_MODULE=${ENABLE_APPLICATIONS_MODULE:-true}
- REACT_APP_CUSTOM_MAP_URL=${EPD_CUSTOM_MAP_URL:-http://localhost:4000/map}
- REACT_APP_CUSTOM_LOGOUT_URL=${EPD_IDP_LOGOUT_URL:-https://logontest7.gov.bc.ca/clp-cgi/logoff.cgi?retnow=1&returl=https://epd-keycloak-dev.apps.silver.devops.gov.bc.ca/auth/realms/forms-flow-ai/protocol/openid-connect/logout?post_logout_redirect_uri=http://localhost:4000}
ports:
- "3000:8080"
tty: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash

# Recreate config file
rm -rf ./config.js
touch ./config.js

envsubst < ./config.template.js > ./config.js;
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM8mwzO0j1vTTis0XJ44UGSe+CbsVzcrYDvzzHih+GM0 [email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
# nginx.conf
worker_processes auto;
error_log /var/log/nginx/error.log;

pid /tmp/nginx.pid;


events {
worker_connections 4096;
}

http {
include /etc/nginx/mime.types;
client_body_temp_path /tmp/client_temp;
proxy_temp_path /tmp/proxy_temp_path;
fastcgi_temp_path /tmp/fastcgi_temp;
uwsgi_temp_path /tmp/uwsgi_temp;
scgi_temp_path /tmp/scgi_temp;
default_type application/octet-stream;
server_tokens off;
underscores_in_headers on;

# Use a w3c standard log format
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /var/log/nginx/access.log main;


server {

# add in most common security headers
add_header Content-Security-Policy "default-src * data: blob: filesystem: 'unsafe-inline' 'unsafe-eval'";
add_header Strict-Transport-Security "max-age=31536000; includeSubDomains";
add_header X-Content-Type-Options "nosniff";
add_header X-XSS-Protection 1;
add_header X-Frame-Options SAMEORIGIN;



listen 8080;
server_name _;

index index.html;
error_log /dev/stdout info;
access_log /dev/stdout;

# forms-flow-web-root-config
location / {
add_header 'Access-Control-Allow-Origin' '*';
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html;
}

error_page 500 502 503 504 /50x.html;

location = /50x.html {
root /usr/share/nginx/html;
}
}
}
Loading
Loading