Merge pull request #3723 from bcgov/v4.2.0-69.18-release-temp

V4.2.0 69.18 release

.github/workflows/retag-test-to-uat.yml

@@ -84,37 +84,12 @@ jobs:
       - name: call scripts to upgrade database
         shell: bash
         run: |
-          oc process -f ./openshift/4.0/templates/jobs/db-deploy.yaml -p DB_SECRET_NAME=pims-database -p GIT_BRANCH=test -p SERVER_NAME=sqlprd.th.gov.bc.ca -p DB_NAME=PIMS_UAT -p NAMESPACE=3cd915-test | oc create -f - | grep -oP "(?<=job\.batch/)[^\s]*" | (read JOB_NAME; oc wait --for=condition=complete job/$JOB_NAME --timeout=120s)
-
-  sync-keycloak:
-    name: Sync Keycloak
-    needs: database-upgrade
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Setup .NET 6
-        uses: actions/setup-dotnet@v2
-        with:
-          dotnet-version: "6.0.x"
-
-      - name: Install dependencies for keycloak sync
-        run: dotnet restore
-        working-directory: ${{env.sync-directory}}
-
-      - name: Build keycloak sync
-        run: dotnet build
-        working-directory: ${{env.sync-directory}}
-
-      - name: Start keycloak sync
-        run: dotnet run
-        working-directory: ${{env.sync-directory}}
+          oc process -f ./openshift/4.0/templates/jobs/db-deploy.yaml -p DB_SECRET_NAME=pims-database-uat -p GIT_BRANCH=test -p SERVER_NAME=sqlprd.th.gov.bc.ca -p DB_NAME=PIMS_UAT -p NAMESPACE=3cd915-test | oc create -f - | grep -oP "(?<=job\.batch/)[^\s]*" | (read JOB_NAME; oc wait --for=condition=complete job/$JOB_NAME --timeout=120s)
 
   ci-cd-end-notification:
     name: CI-CD End Notification to Teams Channel
     runs-on: ubuntu-latest
-    needs: sync-keycloak
+    needs: database-upgrade
     steps:
       - name: check workflow status
         uses: martialonline/workflow-status@v4

Makefile

@@ -312,5 +312,15 @@ mayan-up: ## Calls the docker compose up for the mayan images
 	@echo "$(P) Create or start mayan-edms system"
 	@cd tools/mayan-edms; docker-compose --profile all up -d
 
+generate-tsapi: ## Generates the pims API typescript files
+	@echo "$(P) Generating pims api Ts files..."
+	@cd tools/TsModelGenerator; dotnet build; dotnet run;
+	@make frontend-lint
+
+
+frontend-lint:
+	@echo "$(P) Running lint:fix..."
+	@cd source/frontend; npm run lint:fix;
+
 .PHONY: logs start destroy local setup restart refresh up down stop build rebuild clean client-test server-test pause-30 server-run db-clean db-drop db-seed db-refresh db-script db-scaffold npm-clean npm-refresh keycloak-sync convert backend-coverage frontend-coverage backend-test frontend-test env mayan-up
 

etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Integration Services Project1.dtproj.user

@@ -8,6 +8,9 @@
         <UseWinAuth>false</UseWinAuth>
         <WinAuthUserName />
         <WinAuthDomain />
+        <ServerName>ssistst.th.gov.bc.ca</ServerName>
+        <PathOnServer>/SSISDB/PIMS_DEV/LISDB_PIMS_MANAGEMENT</PathOnServer>
+        <StartObjectID>LIS_DB_to_PIMS_ACTIVITY_PSP_6943.dtsx</StartObjectID>
         <UserIDs />
         <UserPasswords />
         <OfflineMode>false</OfflineMode>

etl/LISDB_PIMS_MANAGEMENT/Integration Services Project1/Package.dtsx

@@ -7,13 +7,13 @@
   DTS:CreatorName="Xerces\Devin Smith"
   DTS:DTSID="{6C914856-AF42-4D92-BBE1-AA6D6E2F0355}"
   DTS:ExecutableType="Microsoft.Package"
-  DTS:LastModifiedProductVersion="16.0.948.0"
+  DTS:LastModifiedProductVersion="16.0.5270.0"
   DTS:LocaleID="1033"
   DTS:ObjectName="Package"
   DTS:PackageType="5"
   DTS:ProtectionLevel="0"
-  DTS:VersionBuild="6"
-  DTS:VersionGUID="{BCD0BF53-9147-4093-9AA0-82F4932373C5}">
+  DTS:VersionBuild="8"
+  DTS:VersionGUID="{9EEFEAE5-0A29-4CEB-9ECD-01034D41441C}">
   <DTS:Property
     DTS:Name="PackageFormatVersion">8</DTS:Property>
   <DTS:ConnectionManagers>
@@ -1036,6 +1036,14 @@ where [refTable].[PID] = ?</property>
           Size="172,42"
           Id="Package\Summary\PIMS_PROPERTY"
           TopLeft="358,270" />
+        <NodeLayout
+          Size="183,42"
+          Id="Package\Summary\CONCAT COLUMNS"
+          TopLeft="363,376" />
+        <NodeLayout
+          Size="211,42"
+          Id="Package\Summary\Update PIMS_PROPERTY"
+          TopLeft="334,481" />
         <EdgeLayout
           Id="Package\Summary.Paths[OLE DB Source Output]"
           TopLeft="435.5,207">
@@ -1067,17 +1075,11 @@ where [refTable].[PID] = ?</property>
             </mssgle:Curve>
           </EdgeLayout.Curve>
           <EdgeLayout.Labels>
-            <EdgeLabelCollection />
+            <mssgm:EdgeLabel
+              BoundingBox="0,0,0,0"
+              RelativePosition="Any" />
           </EdgeLayout.Labels>
         </EdgeLayout>
-        <NodeLayout
-          Size="211,42"
-          Id="Package\Summary\Update PIMS_PROPERTY"
-          TopLeft="334,481" />
-        <NodeLayout
-          Size="183,42"
-          Id="Package\Summary\CONCAT COLUMNS"
-          TopLeft="363,376" />
         <EdgeLayout
           Id="Package\Summary.Paths[Lookup Match Output]"
           TopLeft="444,312">
@@ -1145,7 +1147,9 @@ where [refTable].[PID] = ?</property>
             </mssgle:Curve>
           </EdgeLayout.Curve>
           <EdgeLayout.Labels>
-            <EdgeLabelCollection />
+            <mssgm:EdgeLabel
+              BoundingBox="0,0,0,0"
+              RelativePosition="Any" />
           </EdgeLayout.Labels>
         </EdgeLayout>
       </GraphLayout>
@@ -1170,7 +1174,7 @@ where [refTable].[PID] = ?</property>
       <Property>
         <Name>OverwriteParamsSQLProp</Name>
         <Value
-          type="q2:boolean">false</Value>
+          type="q2:string">false</Value>
       </Property>
       <Property>
         <Name>UsedTableName</Name>
@@ -1180,7 +1184,7 @@ where [refTable].[PID] = ?</property>
       <Property>
         <Name>TableInfoObjectType</Name>
         <Value
-          type="q4:int">0</Value>
+          type="q4:string">0</Value>
       </Property>
       <Property>
         <Name>DataSourceViewID</Name>

etl/PAIMS_PIMS_ACQUISITION_PROPERTY/PAIMS_PIMS_ACQUISITION_PROPERTY.sln

@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.33027.164
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{C9674DCB-5085-4A16-B785-4C70DD1589BD}") = "PAIMS_PIMS_ACQUISITION_PROPERTY", "PAIMS_PIMS_ACQUISITION_PROPERTY\PAIMS_PIMS_ACQUISITION_PROPERTY.dtproj", "{633FBC8E-66BF-4C1F-B08F-A51DF91906D9}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Development|Default = Development|Default
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{633FBC8E-66BF-4C1F-B08F-A51DF91906D9}.Development|Default.ActiveCfg = Development
+		{633FBC8E-66BF-4C1F-B08F-A51DF91906D9}.Development|Default.Build.0 = Development
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {C4AB3322-A077-47DF-A4BF-9E644AA8F6BB}
+	EndGlobalSection
+EndGlobal