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

Release Dev to Test #1450

Merged
merged 25 commits into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
90de834
SIMSBIOHUB-606: Upload Capture Attachments (#1388)
MacQSL Oct 7, 2024
38300ce
Add Comments to Observation Subcount (#1377)
mauberti-bc Oct 8, 2024
582c39d
SIMSBIOHUB-622: Allow Duplicate Ecological Unit Categories in Surveys…
mauberti-bc Oct 15, 2024
798ad39
TechDebt: Add missing connection.commit() calls. (#1400)
NickPhura Oct 18, 2024
f347e26
Update Survey Job Lookup Options for Survey Participants (#1396)
AMEIJER1 Oct 22, 2024
52c2c51
SIMSBIOHUB-623: Add Site Name and Description When Creating New Sampl…
mauberti-bc Oct 23, 2024
bb7855b
Custom Linter (#1408)
MacQSL Oct 23, 2024
0d9d67d
SIMSBIOHUB-619: Import Observations With Sampling Information (#1389)
mauberti-bc Oct 30, 2024
1ab1e64
Add Navigation Menu to Manage Page Breadcrumbs (#1416)
AMEIJER1 Nov 12, 2024
5203f31
Add Duration to Sampling Period UI Table (#1414)
LouisThedroux Nov 12, 2024
462b432
SIMSBIOHUB-629: Paginate Sampling Sites & Separate Spatial Data in AP…
mauberti-bc Nov 13, 2024
365ce92
TechDebt: API: Environment Variables Validation (#1425)
MacQSL Nov 14, 2024
3b86c70
SIMSBIOHUB-620: Manage System Alerts (#1401)
mauberti-bc Nov 15, 2024
825bfe6
BugFix: Update ENV Values (#1429)
MacQSL Nov 15, 2024
9f51398
SIMSBIOHUB-637: Add Geometry to Survey Blocks (Backend) (#1421)
mauberti-bc Nov 18, 2024
be4656f
SIMSBIOHUB-641: Fix Migration (#1435)
NickPhura Nov 22, 2024
8f48b31
UI: Adjust Sampling Data Container Styling (#1395)
mauberti-bc Nov 22, 2024
0a9a57f
SIMSBIOHUB-632: Display Markdown in Vote Dialogs (#1418)
mauberti-bc Nov 25, 2024
f0cb44e
SIMSBIOHUB-638: Add Vantage to Techniques (Backend) (#1423)
mauberti-bc Nov 26, 2024
82c8d9f
BugFix: Change Date Format from UTC to Local Time in combineDatetime …
mauberti-bc Dec 3, 2024
bd62fe6
BugFix: Allow Geojson of Survey Blocks to be Null (#1442)
mauberti-bc Dec 3, 2024
a7bcd49
Bugfix: Survey block Openapi schema (#1443)
MacQSL Dec 4, 2024
1c83bb7
SIMSBIOHUB-644: Add pagination, Update toggle group component (#1436)
NickPhura Dec 6, 2024
662ae2f
SIMSBIOHUB-633: Revamp CSV Imports - Critter (#1438)
MacQSL Dec 7, 2024
c8dfb81
BugFix: Make Environments Case Insensitive in Observations Import (#1…
mauberti-bc Dec 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions .github/workflows/cleanClosedPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ jobs:
with:
persist-credentials: false

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/cleanMergedPR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@ jobs:
with:
persist-credentials: false

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down
53 changes: 53 additions & 0 deletions .github/workflows/custom-linter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Custom Linter

on:
pull_request:
types: [opened, reopened, synchronize, ready_for_review]
push:
branches:
- dev

jobs:
# OpenAPI request bodies should contain the property `required` and be set to true
#
# // Valid (request body required)
#
# requestBody: {
# required: true,
# content: {}
# }
#
# // Invalid (request body not required)
#
# requestBody: {
# content: {}
# }
#
openApiRequiredRequestBody:
name: OpenAPI requestBody missing required:true
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Find schemas with optional request bodies
run: |
# For OpenAPI schemas, find all request bodies that don't have `required:true`
#
# Find all non-test files in apr/src/paths
# Find all request bodies that don't contain required:true property
# Print to stdout line num + filename and return exit code
find api/src/paths -type f ! -name '*.test.ts' -exec \
awk '
BEGIN {found=0}
/requestBody:/ {found=1}
/required: true/ {found=0}
/content:/ {
if (found) print "line: " NR, FILENAME;
found=0;
}
' {} \; \
| grep . && exit 1 || exit 0



50 changes: 49 additions & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -232,6 +238,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -293,6 +305,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -349,6 +367,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -409,6 +433,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -463,6 +493,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand All @@ -485,7 +521,7 @@ jobs:
deployDatabaseSetup:
name: Deploy Database Setup Image
runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 30
if: ${{ github.event.pull_request.merged == false &&
github.event.pull_request.draft == false &&
( needs.skipDuplicateActions.outputs.ignore_skip == 'true' ||
Expand Down Expand Up @@ -518,6 +554,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -575,6 +617,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down
62 changes: 61 additions & 1 deletion .github/workflows/deployStatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ jobs:
needs:
- checkEnv
steps:
# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -119,6 +125,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -169,6 +181,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -219,6 +237,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -269,6 +293,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -320,6 +350,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -371,6 +407,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand All @@ -392,7 +434,7 @@ jobs:
deployDatabaseSetup:
name: Deploy Database Setup Image
runs-on: ubuntu-latest
timeout-minutes: 20
timeout-minutes: 30
if: ${{ github.event.pull_request.merged == true }}
env:
PR_NUMBER: ${{ github.event.number }}
Expand Down Expand Up @@ -423,6 +465,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -475,6 +523,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down Expand Up @@ -528,6 +582,12 @@ jobs:
if: steps.cache-repo.outputs.cache-hit != 'true'
uses: actions/checkout@v4

# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
Expand Down
54 changes: 30 additions & 24 deletions .github/workflows/toDraft.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,30 @@
# Switch to Draft
# Scales down running PODS when switching to Draft
name: Draft Scale Down

on:
pull_request:
types: [converted_to_draft]

jobs:
scaleDownPods:
name: Scale down the pods for this PR
runs-on: ubuntu-latest
timeout-minutes: 20
env:
PR_NUMBER: ${{ github.event.number }}
steps:
# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
- name: Log in to OpenShift
run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443

- name: Scale down
run: oc get deploymentconfig --namespace af2668-dev --selector env-id=$PR_NUMBER -o name | awk '{print "oc scale --replicas=0 " $1}' | bash
# Switch to Draft
# Scales down running PODS when switching to Draft
name: Draft Scale Down

on:
pull_request:
types: [converted_to_draft]

jobs:
scaleDownPods:
name: Scale down the pods for this PR
runs-on: ubuntu-latest
timeout-minutes: 20
env:
PR_NUMBER: ${{ github.event.number }}
steps:
# Install oc, which was removed from the ubuntu-latest image in v24.04
- name: Install OpenShift CLI tools
uses: redhat-actions/openshift-tools-installer@v1
with:
oc: "4.14"

# Log in to OpenShift.
# Note: The secrets needed to log in are NOT available if the PR comes from a FORK.
# PR's must originate from a branch off the original repo or else all openshift `oc` commands will fail.
- name: Log in to OpenShift
run: oc login --token=${{ secrets.TOOLS_SA_TOKEN }} --server=https://api.silver.devops.gov.bc.ca:6443

- name: Scale down
run: oc get deploymentconfig --namespace af2668-dev --selector env-id=$PR_NUMBER -o name | awk '{print "oc scale --replicas=0 " $1}' | bash
Loading
Loading