Skip to content

Commit 13e201a

Browse files
richard-aotrichard-aot
authored
Merge pull request #5617 from bcgov/dev-revert-merge
Revert "Merge branch 'dev-marshal' into dev"
2 parents fcf70a9 + 64da855 commit 13e201a

File tree

166 files changed

+247
-146572
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+247
-146572
lines changed

‎.github/workflows/template-api-cd.yml‎

Lines changed: 0 additions & 121 deletions
This file was deleted.

‎.github/workflows/template-api-ci.yml‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.gitignore‎

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -126,30 +126,4 @@ datamigrations/FOIMOD.AXIS.DocumentMigration/*/obj/*
126126
datamigrations/FOIMOD.AXIS.DocumentMigration/*/bin/*
127127
datamigrations/FOIMOD.AXIS.DocumentMigration/.vs/*
128128
*.locenv
129-
130-
integrationapi/MCS.FOI.Integration/.vs/
131-
integrationapi/MCS.FOI.Integration/.vs/*
132-
integrationapi/MCS.FOI.Integration/*/bin/*
133-
integrationapi/MCS.FOI.Integration/*/obj/*
134-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration/.config/dotnet-tools.json
135-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/bin/
136-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/bin/*
137-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/obj/
138-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/obj/*
139-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/out/
140-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/out/*
141-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/GeneratedDocuments/
142-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.API/GeneratedDocuments/*
143-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Application/bin/
144-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Application/bin/*
145-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Application/obj/
146-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Application/obj/*
147-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Core/bin/
148-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Core/bin/*
149-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Core/obj/
150-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Core/obj/*
151-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Infrastructure/bin/
152-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Infrastructure/bin/*
153-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Infrastructure/obj/
154-
integrationapi/MCS.FOI.Integration/MCS.FOI.Integration.Infrastructure/obj/*
155-
.gitignore
129+
*.locenv

‎docker-compose-linux.yml‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -166,30 +166,6 @@ services:
166166
networks:
167167
- forms-flow-bpm-network
168168

169-
foi-template-api:
170-
container_name: foi-template
171-
build:
172-
context: ./integrationapi/MCS.FOI.Integration/
173-
dockerfile: Dockerfile
174-
volumes:
175-
- "./App_Data:/app/App_Data"
176-
ports:
177-
- "3002:8080"
178-
environment:
179-
- ConnectionStrings__DBConnection=${FOI_TEMPLATE_DB_CONNECTIONSTRING}
180-
- ConnectionStrings__Redis=${FOI_TEMPLATE_REDIS_CONNECTIONSTRING}
181-
- AWSS3__OSS_S3_HOST=https://${OSS_S3_HOST}
182-
- AWSS3__OSS_S3_FORMS_BUCKET=${OSS_S3_FORMS_BUCKET}
183-
- ApiSettings__CorrespondenceUrl=${FOI_TEMPLATE_CORRESPONDENCE_URL}
184-
185-
- JWTAuth__JWT_OIDC_AUDIENCE=${JWT_OIDC_AUDIENCE}
186-
- JWTAuth__CORS_ORIGIN=${FOI_TEMPLATE_CORS_ORIGIN}
187-
- JWTAuth__JWT_OIDC_ISSUER=${KEYCLOAK_URL}/auth/realms/${KEYCLOAK_URL_REALM}
188-
- JWTAuth__IAOGroups=${FOI_TEMPLATE_IAOGROUPS}
189-
- SPELLCHECK_DICTIONARY_PATH=${SPELLCHECK_DICTIONARY_PATH}
190-
- SPELLCHECK_JSON_FILENAME=${FOI_TEMPLATE_SPELLCHECK_DICTIONARY_PATH}
191-
- SyncfusionLicense=${FOI_TEMPLATE_SPELLCHECK_JSON_FILENAME}
192-
193169
foi-web:
194170
container_name: foi-web
195171
build:
@@ -217,8 +193,9 @@ services:
217193
- REACT_APP_FOI_RECORD_FORMATS=${FOI_RECORD_FORMATS}
218194
- REACT_APP_RECORD_PROCESSING_HRS=${RECORD_PROCESSING_HRS}
219195
- REACT_APP_SESSION_SECURITY_KEY=${REACT_APP_SESSION_SECURITY_KEY}
220-
- REACT_APP_FOI_TEMPLATE_API_URL=${REACT_APP_FOI_TEMPLATE_API_URL}
221-
- REACT_APP_SF_KEY=${REACT_APP_SF_KEY}
196+
volumes:
197+
- ".:/app"
198+
- "/app/node_modules"
222199
ports:
223200
- "3000:8080"
224201
tty: true

‎docker-compose.yml‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -229,28 +229,6 @@ services:
229229
networks:
230230
- forms-flow-bpm-network
231231

232-
foi-template-api:
233-
container_name: foi-template
234-
build:
235-
context: ./integrationapi/MCS.FOI.Integration/
236-
dockerfile: Dockerfile
237-
ports:
238-
- "3002:8080"
239-
environment:
240-
- ConnectionStrings__DBConnection=${FOI_TEMPLATE_DB_CONNECTIONSTRING}
241-
- ConnectionStrings__Redis=${FOI_TEMPLATE_REDIS_CONNECTIONSTRING}
242-
- AWSS3__OSS_S3_HOST=https://${OSS_S3_HOST}
243-
- AWSS3__OSS_S3_FORMS_BUCKET=${OSS_S3_FORMS_BUCKET}
244-
- ApiSettings__CorrespondenceUrl=${FOI_TEMPLATE_CORRESPONDENCE_URL}
245-
246-
- JWTAuth__JWT_OIDC_AUDIENCE=${JWT_OIDC_AUDIENCE}
247-
- JWTAuth__CORS_ORIGIN=${FOI_TEMPLATE_CORS_ORIGIN}
248-
- JWTAuth__JWT_OIDC_ISSUER=${KEYCLOAK_URL}/auth/realms/${KEYCLOAK_URL_REALM}
249-
- JWTAuth__IAOGroups=${FOI_TEMPLATE_IAOGROUPS}
250-
- SPELLCHECK_DICTIONARY_PATH=${SPELLCHECK_DICTIONARY_PATH}
251-
- SPELLCHECK_JSON_FILENAME=${FOI_TEMPLATE_SPELLCHECK_DICTIONARY_PATH}
252-
- SyncfusionLicense=${FOI_TEMPLATE_SPELLCHECK_JSON_FILENAME}
253-
254232
foi-web:
255233
container_name: foi-web
256234
build:
@@ -290,8 +268,6 @@ services:
290268
- REACT_APP_FOI_SOLR_API_BASE=${FOI_SOLR_API_BASE}
291269
- REACT_APP_SEARCH_KEYWORD_LIMIT=${SEARCH_KEYWORD_LIMIT}
292270
- REACT_APP_SOLR_DOC_SEARCH_LIMIT=${SOLR_DOC_SEARCH_LIMIT}
293-
- REACT_APP_FOI_TEMPLATE_API_URL=${REACT_APP_FOI_TEMPLATE_API_URL}
294-
- REACT_APP_SF_KEY=${REACT_APP_SF_KEY}
295271
volumes:
296272
- ".:/app"
297273
- "/app/node_modules"

‎foi-start.bat‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ echo "Starting Notification Manager..."
4747

4848
if /I '%choice%'=='N' (
4949

50-
set /P servicenames="Enter services(s) here (ex: web, api, bpm, ffa, template) separated by space?"
50+
set /P servicenames="Enter services(s) here (ex: web, api, bpm, ffa) separated by space?"
5151
(for %%a in (!servicenames!) do (
5252
if /I %%a == bpm (
5353
echo "Starting BPM..."
@@ -72,10 +72,6 @@ set /P servicenames="Enter services(s) here (ex: web, api, bpm, ffa, template) s
7272
docker-compose -f %FFA_DIRECTORY%/../docker-compose.yml up --build -d forms-flow-webapi forms-flow-web
7373
)
7474
)
75-
if /I %%a == template (
76-
echo "Starting Template API..."
77-
docker-compose -f docker-compose.yml up --build -d foi-template-api
78-
)
7975

8076
if !START_REDIS! == Y (
8177
echo "Starting Redis..."

‎foi-stop.bat‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ docker-compose -f %FFA_DIRECTORY%/docker-compose.yml stop forms-flow-forms forms
1212
docker-compose -f %NOTIFICATION_DIRECTORY%/docker-compose.yml down
1313
)
1414
if /I '%stopall%'=='N' (
15-
set /P servicenames="Enter services(s) here (ex: web, api, bpm, redis, ffa, template) separated by space?"
15+
set /P servicenames="Enter services(s) here (ex: web, api, bpm, redis, ffa) separated by space?"
1616
(for %%a in (!servicenames!) do (
1717
if /I %%a == bpm (
1818
echo "Stopping BPM..."
@@ -34,10 +34,6 @@ set /P servicenames="Enter services(s) here (ex: web, api, bpm, redis, ffa, temp
3434
echo "Stopping Redis..."
3535
docker-compose -f docker-compose.yml stop foiredis
3636
)
37-
if /I %%a == template (
38-
echo "Stopping Template API..."
39-
docker-compose -f docker-compose.yml stop foi-template-api
40-
)
4137

4238
))
4339

‎forms-flow-web/Dockerfile‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ ARG REACT_APP_FOI_SOLR_API_BASE
4242
ARG REACT_APP_SEARCH_KEYWORD_LIMIT
4343
ARG REACT_APP_SOLR_DOC_SEARCH_LIMIT
4444

45-
ARG REACT_APP_FOI_TEMPLATE_API_URL
46-
ARG REACT_APP_SF_KEY
4745

4846
ENV NODE_ENV ${NODE_ENV}
4947
ENV GENERATE_SOURCEMAP ${GENERATE_SOURCEMAP}
@@ -83,9 +81,6 @@ ENV REACT_APP_FOI_SOLR_API_BASE ${REACT_APP_FOI_SOLR_API_BASE}
8381
ENV REACT_APP_SEARCH_KEYWORD_LIMIT ${REACT_APP_SEARCH_KEYWORD_LIMIT}
8482
ENV REACT_APP_SOLR_DOC_SEARCH_LIMIT ${REACT_APP_SOLR_DOC_SEARCH_LIMIT}
8583

86-
ENV REACT_APP_FOI_TEMPLATE_API_URL ${REACT_APP_FOI_TEMPLATE_API_URL}
87-
ENV REACT_APP_SF_KEY ${REACT_APP_SF_KEY}
88-
8984
# add `/app/node_modules/.bin` to $PATH
9085
ENV PATH /forms-flow-web/app/node_modules/.bin:$PATH
9186

‎forms-flow-web/Dockerfile.local‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ ARG REACT_APP_SESSION_SECURITY_KEY
3838
ARG REACT_APP_FOI_SOLR_API_BASE
3939
ARG REACT_APP_SEARCH_KEYWORD_LIMIT
4040
ARG REACT_APP_SOLR_DOC_SEARCH_LIMIT
41-
ARG REACT_APP_FOI_TEMPLATE_API_URL
42-
ARG REACT_APP_SF_KEY
4341

4442
ENV NODE_ENV ${NODE_ENV}
4543
ENV GENERATE_SOURCEMAP ${GENERATE_SOURCEMAP}
@@ -70,13 +68,9 @@ ENV REACT_APP_DISABLE_GATHERINGRECORDS_TAB ${REACT_APP_DISABLE_GATHERINGRECORDS_
7068
ENV REACT_APP_RECORD_DOWNLOAD_LIMIT ${REACT_APP_RECORD_DOWNLOAD_LIMIT}
7169
ENV REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT ${REACT_APP_RECORD_DOWNLOAD_SIZE_LIMIT}
7270
ENV REACT_APP_SESSION_SECURITY_KEY ${REACT_APP_SESSION_SECURITY_KEY}
73-
7471
ENV REACT_APP_FOI_SOLR_API_BASE ${REACT_APP_FOI_SOLR_API_BASE}
7572
ENV REACT_APP_SEARCH_KEYWORD_LIMIT ${REACT_APP_SEARCH_KEYWORD_LIMIT}
7673
ENV REACT_APP_SOLR_DOC_SEARCH_LIMIT ${REACT_APP_SOLR_DOC_SEARCH_LIMIT}
77-
78-
ENV REACT_APP_FOI_TEMPLATE_API_URL ${REACT_APP_FOI_TEMPLATE_API_URL}
79-
ENV REACT_APP_SF_KEY ${REACT_APP_SF_KEY}
8074
# add `/app/node_modules/.bin` to $PATH
8175
ENV PATH /forms-flow-web/app/node_modules/.bin:$PATH
8276

‎forms-flow-web/docker-compose.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ services:
3636
- REACT_APP_AXIS_API_URL=${AXIS_API_URL}
3737
- REACT_APP_SOCKETIO_CONNECT_NONCE=${SOCKETIO_CONNECT_NONCE}
3838
- REACT_APP_SESSION_SECURITY_KEY=${REACT_APP_SESSION_SECURITY_KEY}
39-
- REACT_APP_SF_KEY=${REACT_APP_SF_KEY}
4039
volumes:
4140
- ".:/app"
4241
- "/app/node_modules"

0 commit comments

Comments
 (0)