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

Test rook #726

Merged
merged 72 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
095e09d
ci/cd updated for rook
Nov 6, 2023
7329b06
Merge branch 'main' into dev-rook
Nov 10, 2023
ac77709
Merge pull request #615 from bcgov/dev-rook
divyav-aot Nov 14, 2023
adf8f96
Added isoipcereviewlayer attribute to document object sent to FE to g…
Aman-Hundal Dec 5, 2023
52121f1
FE integration for oipcreview layer check completed. Ticket completed:
Aman-Hundal Dec 5, 2023
e0f8684
Refactor of FE conditional check for isoipcreview layer
Aman-Hundal Dec 5, 2023
f08ee33
Changes to copy redactions from redline to oipc.
Dec 8, 2023
e7351c6
Adjusted oipc layer validation logic in backend to incl. request stat…
Aman-Hundal Dec 15, 2023
f756358
small refactor. wIP testing + code clean
Aman-Hundal Dec 15, 2023
27a3d9d
Add oipc layer to api
milosdes Dec 15, 2023
afa19ad
Update Redline for oipc layer
milosdes Dec 15, 2023
4d54180
Remove var declaration
milosdes Dec 15, 2023
a3437af
OIPC validation logic tested and refactored. Ticket 4695 + scenario 1…
Aman-Hundal Dec 15, 2023
23415c2
Merge pull request #646 from bcgov/dev-rook-AH-4695
Aman-Hundal Dec 15, 2023
f458f5b
Update state when creating oipc review layer
milosdes Dec 15, 2023
a1143b8
Changes to redact S14 sections for OIPC.
Dec 20, 2023
03dbaae
Merge pull request #668 from bcgov/dev-rook-AH-4695
sumathi-thirumani Dec 21, 2023
853ee2f
Merge branch 'dev-rook-MD-ST-4169' of https://github.com/bcgov/foi-do…
Aman-Hundal Dec 21, 2023
56bb2ca
Updated presigned redline endpoint
milosdes Dec 22, 2023
8aeba79
Update util function
milosdes Dec 22, 2023
6d989ed
Adjust url based on redline type and layer
milosdes Dec 22, 2023
1afa496
Update redlining for oipc
milosdes Dec 22, 2023
3a22444
Remove disabled add OIPC button
milosdes Dec 22, 2023
57f790c
Revert disable layer button change
milosdes Dec 22, 2023
a5825c1
Adjusted redlining.js to adjust category based on current layer (allo…
Aman-Hundal Dec 22, 2023
ee9c37d
Adjusted FE API calls to create folders with specific names depending…
Aman-Hundal Dec 22, 2023
7c1b1cb
Adjusted logic to show OIPC only if reopen and response package created.
Dec 22, 2023
d920a4e
Merge pull request #680 from bcgov/dev-rook-AH-4169-4596
sumathi-thirumani Dec 22, 2023
b725527
Defensive logic for copy of redaction + page flag copy.
Dec 26, 2023
0b5c507
Merge pull request #681 from bcgov/dev-rook-MD-ST-4169
sumathi-thirumani Dec 27, 2023
22ab8bb
Merge pull request #682 from bcgov/dev-rook
sumathi-thirumani Dec 27, 2023
0d557a8
Merge branch 'dev-rook-MD-4170' into dev-rook-MD-ST-4169
Dec 28, 2023
275c134
Disable pageflag changes on redline when OIPC exists
milosdes Dec 28, 2023
cc74291
Changed to keyword of zipper
Dec 28, 2023
2347647
Merge pull request #684 from bcgov/dev-rook-MD-ST-4169
sumathi-thirumani Dec 28, 2023
a552f25
Merge pull request #683 from bcgov/dev-rook-MD-4679-flagfix
sumathi-thirumani Dec 28, 2023
6f8a642
change the font color to black.
Dec 28, 2023
7bdb1ca
Merge pull request #685 from bcgov/dev-rook-MD-ST-4169
sumathi-thirumani Dec 28, 2023
40e86a0
Merge pull request #686 from bcgov/dev-rook
Aman-Hundal Dec 28, 2023
893b555
redaction layer changes + edit bug
Dec 29, 2023
f9ae998
Removed unused functional methods + edit bug fix changes.
Dec 29, 2023
ee0d137
Removed unused functional methods + edit bug fix changes.
Dec 30, 2023
2f76726
Removed unused functional methods + edit bug fix changes.
Jan 3, 2024
b328d7a
Merge pull request #695 from bcgov/dev-rook-MD-ST-4169
sumathi-thirumani Jan 3, 2024
1e3d013
final package bugfix generation.
Jan 3, 2024
fb2198c
Merge pull request #697 from bcgov/dev-rook-MD-ST-4169
sumathi-thirumani Jan 3, 2024
ebe752c
Merge pull request #698 from bcgov/dev-rook
Aman-Hundal Jan 3, 2024
7f21dba
Change to use validoipcreviewlayer
milosdes Jan 4, 2024
3e324fc
Merge pull request #700 from bcgov/dev-rook-MD-oipcvalidation
sumathi-thirumani Jan 4, 2024
2700f7c
Release of 4953
Jan 4, 2024
454a45e
Merge pull request #701 from bcgov/dev-rook-ST-4953
sumathi-thirumani Jan 4, 2024
35e69b1
Update ContextMenu to use validoipcreviewlayer
milosdes Jan 4, 2024
7d0cb7a
Fix bug
milosdes Jan 5, 2024
b39d2f3
Merge pull request #703 from bcgov/dev-rook-MD-oipcvalidation
sumathi-thirumani Jan 5, 2024
6084f8e
Merge pull request #702 from bcgov/dev-rook
sumathi-thirumani Jan 5, 2024
4db6e18
Set default layer
milosdes Jan 5, 2024
fe03c10
Merge pull request #705 from bcgov/dev-rook-MD-oipcvalidation
milosdes Jan 5, 2024
4bdc817
Fix setting current layer
milosdes Jan 5, 2024
48f85cd
Merge pull request #707 from bcgov/dev-rook-MD-oipcvalidation
milosdes Jan 5, 2024
392b6ab
Set default layer to OIPC if valid
milosdes Jan 5, 2024
9986336
Merge pull request #709 from bcgov/dev-rook-MD-oipcvalidation
sumathi-thirumani Jan 5, 2024
5461554
Merge pull request #708 from bcgov/dev-rook
Aman-Hundal Jan 8, 2024
cbc9fc7
Merge remote-tracking branch 'origin/dev-rook' into dev-oipc
Jan 10, 2024
8ad8fc0
Merge changes from oipc to leverage use of layername.
Jan 10, 2024
41d2fa6
Changes to allow copy only for first time of oipc layer.
Jan 11, 2024
9dc36c0
OIPC Integration
Jan 11, 2024
45130c8
Remove redundant logging.
Jan 11, 2024
75e64de
OIPC Integration + additional changes.
Jan 11, 2024
4356c7f
OIPC Integration + additional changes.
Jan 12, 2024
3221884
Merge pull request #723 from bcgov/dev-oipc
sumathi-thirumani Jan 18, 2024
e46b8b6
Changes to disable OIPC review for redline layer.
Jan 18, 2024
78187dd
Merge pull request #725 from bcgov/dev-oipc-v2
sumathi-thirumani Jan 18, 2024
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
16 changes: 16 additions & 0 deletions .github/workflows/api-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- main
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "api/**"
- ".github/workflows/api-cd.yml"
Expand Down Expand Up @@ -59,7 +61,21 @@ jobs:
echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV
- name: Set ENV variables for dev-rook branch
if: ${{ github.ref_name == 'dev-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
echo "ENV_NAME=dev" >> $GITHUB_ENV

- name: Set ENV variables for test-rook branch
if: ${{ github.ref_name == 'test-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=test-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV
- name: Login Openshift
shell: bash
run: |
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/dedupe-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- main
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "computingservices/DedupeServices/**"
- ".github/workflows/dedupe-cd.yml"
Expand Down Expand Up @@ -62,6 +64,22 @@ jobs:
echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Set ENV variables for dev-rook branch
if: ${{ github.ref_name == 'dev-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
echo "ENV_NAME=dev" >> $GITHUB_ENV

- name: Set ENV variables for test-rook branch
if: ${{ github.ref_name == 'test-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=test-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Login Openshift
shell: bash
run: |
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/fileconv-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- main
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "MCS.FOI.S3FileConversion/**"
- ".github/workflows/fileconv-cd.yml"
Expand Down Expand Up @@ -62,6 +64,22 @@ jobs:
echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Set ENV variables for dev-rook branch
if: ${{ github.ref_name == 'dev-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
echo "ENV_NAME=dev" >> $GITHUB_ENV

- name: Set ENV variables for test-rook branch
if: ${{ github.ref_name == 'test-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=test-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Login Openshift
shell: bash
run: |
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/pdfstitch-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- main
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "computingservices/PDFStitchServices/**"
- ".github/workflows/pdfstitch-cd.yml"
Expand Down Expand Up @@ -61,6 +63,22 @@ jobs:
echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Set ENV variables for dev-rook branch
if: ${{ github.ref_name == 'dev-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
echo "ENV_NAME=dev" >> $GITHUB_ENV

- name: Set ENV variables for test-rook branch
if: ${{ github.ref_name == 'test-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=test-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Login Openshift
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pdfstitch-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- dev
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "computingservices/PDFStitchServices/**"

Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/web-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- main
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "web/**"
- ".github/workflows/web-cd.yml"
Expand Down Expand Up @@ -61,6 +63,22 @@ jobs:
echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Set ENV variables for dev-rook branch
if: ${{ github.ref_name == 'dev-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
echo "ENV_NAME=dev" >> $GITHUB_ENV

- name: Set ENV variables for test-rook branch
if: ${{ github.ref_name == 'test-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=test-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Login Openshift
shell: bash
Expand Down
18 changes: 18 additions & 0 deletions .github/workflows/zippingservice-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- main
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "computingservices/ZippingServices/**"
- ".github/workflows/zippingservice-cd.yml"
Expand Down Expand Up @@ -61,6 +63,22 @@ jobs:
echo "TAG_NAME=test-marshal" >> $GITHUB_ENV
echo "BRANCH_NAME=test-marshal" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Set ENV variables for dev-rook branch
if: ${{ github.ref_name == 'dev-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=dev-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=dev-rook" >> $GITHUB_ENV
echo "ENV_NAME=dev" >> $GITHUB_ENV

- name: Set ENV variables for test-rook branch
if: ${{ github.ref_name == 'test-rook' }}
run: |
echo "For ${{ github.ref_name }} branch"
echo "TAG_NAME=test-rook" >> $GITHUB_ENV
echo "BRANCH_NAME=test-rook" >> $GITHUB_ENV
echo "ENV_NAME=test" >> $GITHUB_ENV

- name: Login Openshift
shell: bash
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/zippingservice-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- dev
- dev-marshal
- test-marshal
- dev-rook
- test-rook
paths:
- "computingservices/ZippingServices/**"

Expand Down
43 changes: 43 additions & 0 deletions api/migrations/versions/549893ea9059_oipc.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
"""empty message

Revision ID: 549893ea9059
Revises: 2045c976ea60
Create Date: 2023-11-23 22:53:32.071886

"""
from alembic import op
import sqlalchemy as sa
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision = '549893ea9059'
down_revision = '2045c976ea60'
branch_labels = None
depends_on = None


def upgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('AnnotationSections', sa.Column('redactionlayerid', sa.Integer, nullable=False, server_default='1'))
op.create_foreign_key(None, 'AnnotationSections', 'RedactionLayers', ['redactionlayerid'], ['redactionlayerid'])
op.execute(
'ALTER TABLE public."AnnotationSections" DROP CONSTRAINT "annotationsection_version_key";'
)
op.execute(
'ALTER TABLE public."AnnotationSections" ADD CONSTRAINT annotationsection_version_redactionlayerid_key UNIQUE (annotationname, version, redactionlayerid);'
)
op.execute('Update public."AnnotationSections" set redactionlayerid = 1 where redactionlayerid is null ')

# ### end Alembic commands ###


def downgrade():
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('AnnotationSections', 'redactionlayerid')
op.execute(
'ALTER TABLE public."AnnotationSections" DROP CONSTRAINT "annotationsection_version_redactionlayerid_key";'
)
op.execute(
'ALTER TABLE public."AnnotationSections" ADD CONSTRAINT annotationsection_version_key UNIQUE (annotationname, version);'
)
# ### end Alembic commands ###
Loading
Loading