Merge branch 'staging' into main

DTS-STN · Jul 5, 2024 · f254ec5 · f254ec5
2 parents 51536ab + 08d2f69
commit f254ec5
Show file tree

Hide file tree

Showing 14 changed files with 411 additions and 2,454 deletions.
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
@@ -0,0 +1,8 @@
+
+change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
+
+template: |
+  ## Changes
+
+  $CHANGES
+
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -0,0 +1,24 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    permissions:
+      # Write permission is required to create a github release
+      contents: write
+      # Write permission is required for autolabeler
+      pull-requests: write
+    steps:
+      - uses: release-drafter/release-drafter@v6
+        with:
+          name: next
+          tag: next
+          version: next
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
diff --git a/__mocks__/utils.mock.ts b/__mocks__/utils.mock.ts
@@ -1,3 +1,6 @@
 import { TextEncoder, TextDecoder } from 'util'
 
 Object.assign(global, { TextDecoder, TextEncoder })
+
+// for testing locally comment.
+// process.env.AUTH_DISABLED= "true"
diff --git a/__tests__/pages/privacy-notice-terms-conditions.test.js b/__tests__/pages/privacy-notice-terms-conditions.test.js
diff --git a/components/Layout.js b/components/Layout.js
@@ -199,25 +199,45 @@ export default function Layout(props) {
         refPageAA={props.refPageAA}
       />
 
-      <Footer
-        lang={!props.locale ? 'en' : props.locale}
-        brandLinks={[
-          {
-            href: t.footerTermsAndConditionURL,
-            id: 'linkTC',
-            text: t.footerTermsAndCondition,
-          },
-          {
-            href: t.footerPrivacyURL,
-            id: 'linkPR',
-            text: t.footerPrivacy,
-          },
-        ]}
-        contactLink={contactLink}
-        btnLink="#top"
-        id="page-footer"
-      />
-      <script type="text/javascript">_satellite.pageBottom();</script>
+      {process.env.ENVIRONMENT === 'production' ? (
+        <Footer
+          lang={!props.locale ? 'en' : props.locale}
+          brandLinks={[
+            {
+              href: t.footerTermsAndConditionURL,
+              id: 'linkTC',
+              text: t.footerTermsAndCondition,
+            },
+            {
+              href: t.footerPrivacyURL,
+              id: 'linkPR',
+              text: t.footerPrivacy,
+            },
+          ]}
+          contactLink={contactLink}
+          btnLink="#top"
+          id="page-footer"
+        />
+      ) : (
+        <Footer
+          lang={!props.locale ? 'en' : props.locale}
+          brandLinks={[
+            {
+              href: t.footerTermsAndConditionDevURL,
+              id: 'linkTC',
+              text: t.footerTermsAndCondition,
+            },
+            {
+              href: t.footerPrivacyDevURL,
+              id: 'linkPR',
+              text: t.footerPrivacy,
+            },
+          ]}
+          contactLink={contactLink}
+          btnLink="#top"
+          id="page-footer"
+        />
+      )}
     </>
   )
 }

diff --git a/cypress/e2e/termsConditions.cy.js b/cypress/e2e/termsConditions.cy.js
diff --git a/locales/en.js b/locales/en.js
@@ -117,12 +117,18 @@ export default {
   footerAboutURL: 'https://www.canada.ca/en/government/about.html',
   footerAbout: 'About Canada.ca',
 
+  footerTermsAndConditionDevURL:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=eng',
   footerTermsAndConditionURL:
-    '/privacy-notice-terms-conditions#termsAndConditions',
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=eng',
+
   footerTermsAndCondition: 'Terms and conditions',
   footerTermsAndConditionAnchor: 'termsAndConditions',
 
-  footerPrivacyURL: '/privacy-notice-terms-conditions',
+  footerPrivacyDevURL:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=eng',
+  footerPrivacyURL:
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=eng',
   footerPrivacy: 'Privacy',
   footerPrivacyAnchor: 'privacy',
 

diff --git a/locales/fr.js b/locales/fr.js
@@ -110,12 +110,17 @@ export default {
   footerAboutURL: 'https://www.canada.ca/en/government/about.html',
   footerAbout: 'À propos de Canada.ca',
 
+  footerTermsAndConditionDevURL:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerTermsAndConditionURL:
-    '/fr/avis-confidentialite-modalites#termesEtConditions',
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerTermsAndCondition: 'Avis',
   footerTermsAndConditionAnchor: 'termesEtConditions',
 
-  footerPrivacyURL: '/fr/avis-confidentialite-modalites/',
+  footerPrivacyDevURL:
+    'https://srv241-s2.sade.hrdc-drhc.gc.ca/ecas-seca/rascl_ii/SCL/TC.aspx?mode=ReadOnly&lang=fra',
+  footerPrivacyURL:
+    'https://srv136.services.gc.ca/ecas-seca/rascl/SCL/TC.aspx?mode=ReadOnly&lang=fra',
   footerPrivacy: 'Confidentialité',
   footerPrivacyAnchor: 'confidentialité',
 

diff --git a/next.config.js b/next.config.js
@@ -29,10 +29,6 @@ const REWRITES = [
     source: '/contactez-nous/communiquer-regime-pensions-canada',
     destination: '/contact-us/contact-canada-pension-plan',
   },
-  {
-    source: '/avis-confidentialite-modalites',
-    destination: '/privacy-notice-terms-conditions',
-  },
   {
     source: '/demande-revision',
     destination: '/decision-reviews',