Merge branch 'main' into fix/helm-pvc-template

bcgov · Jan 9, 2024 · c9b6e27 · c9b6e27
2 parents 834bd17 + ea9c88d
commit c9b6e27
Show file tree

Hide file tree

Showing 14 changed files with 747 additions and 872 deletions.
diff --git a/.github/workflows/stale.yaml b/.github/workflows/stale.yaml
@@ -19,4 +19,5 @@ jobs:
           days-before-pr-stale: 45
           days-before-issue-close: 5
           days-before-pr-close: 10
+          exempt-issue-labels: pinned, bug
 
diff --git a/services/tenant-ui/frontend/package-lock.json b/services/tenant-ui/frontend/package-lock.json
diff --git a/services/tenant-ui/frontend/package.json b/services/tenant-ui/frontend/package.json
@@ -16,52 +16,52 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@intlify/unplugin-vue-i18n": "^1.5.0",
+    "@intlify/unplugin-vue-i18n": "^2.0.0",
     "@jsonforms/vue": "^3.1.0",
     "@jsonforms/vue-vanilla": "^3.1.0",
     "@vuelidate/core": "^2.0.3",
     "@vuelidate/validators": "^2.0.4",
-    "axios": "^1.6.2",
-    "date-fns": "^2.29.3",
-    "dompurify": "^3.0.6",
-    "json-editor-vue": "^0.11.1",
-    "marked": "^11.0.0",
+    "axios": "^1.6.4",
+    "date-fns": "^3.0.6",
+    "dompurify": "^3.0.7",
+    "json-editor-vue": "^0.11.2",
+    "marked": "^11.1.1",
     "oidc-client-ts": "^2.4.0",
     "pinia": "^2.1.7",
     "primeflex": "^3.3.1",
     "primeicons": "^6.0.1",
-    "primevue": "^3.42.0",
+    "primevue": "^3.45.0",
     "qrcode.vue": "^3.4.1",
-    "vue": "^3.3.9",
+    "vue": "^3.4.5",
     "vue-i18n": "^9.8.0",
-    "vue-json-pretty": "^2.2.4",
+    "vue-json-pretty": "^2.3.0",
     "vue-router": "^4.2.5",
     "vue-toastification": "^2.0.0-rc.5"
   },
   "devDependencies": {
     "@intlify/eslint-plugin-vue-i18n": "^2.0.0",
     "@pinia/testing": "^0.1.3",
     "@types/dompurify": "^3.0.5",
-    "@typescript-eslint/eslint-plugin": "^6.13.1",
-    "@typescript-eslint/parser": "^6.13.1",
-    "@vitejs/plugin-vue": "^4.5.1",
+    "@typescript-eslint/eslint-plugin": "^6.18.0",
+    "@typescript-eslint/parser": "^6.18.0",
+    "@vitejs/plugin-vue": "^5.0.2",
     "@vitest/coverage-v8": "^0.34.6",
-    "@vue/eslint-config-prettier": "^8.0.0",
+    "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "^2.4.3",
-    "eslint": "^8.54.0",
-    "eslint-plugin-prettier": "^5.0.1",
+    "eslint": "^8.56.0",
+    "eslint-plugin-prettier": "^5.1.2",
     "eslint-plugin-vue": "^9.19.2",
     "flat": "^6.0.1",
     "glob": "^10.3.10",
     "jsdom": "^23.0.1",
-    "msw": "^2.0.8",
-    "prettier": "^3.1.0",
-    "sass": "^1.69.5",
-    "typescript": "^5.2.2",
-    "vite": "^5.0.5",
+    "msw": "^2.0.12",
+    "prettier": "^3.1.1",
+    "sass": "^1.69.7",
+    "typescript": "^5.3.3",
+    "vite": "^5.0.10",
     "vitest": "^0.34.6",
-    "vue-tsc": "^1.8.24",
-    "whatwg-fetch": "^3.6.19"
+    "vue-tsc": "^1.8.27",
+    "whatwg-fetch": "^3.6.20"
   }
 }
diff --git a/...enant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue b/...enant-ui/frontend/src/components/innkeeper/tenants/deleteTenant/ConfirmTenantDeletion.vue
@@ -67,7 +67,7 @@ async function handleDelete() {
     emit('success');
     emit('closed');
   } catch (err: any) {
-    console.log(err);
+    console.error(err);
     toast.error('Failure: ${err}');
   }
 }

diff --git a/services/tenant-ui/frontend/src/helpers/index.ts b/services/tenant-ui/frontend/src/helpers/index.ts
@@ -1,6 +1,6 @@
-import { format, fromUnixTime, parseJSON } from 'date-fns';
+import { Locale, format, fromUnixTime, parseJSON } from 'date-fns';
 import { enCA, fr, ja } from 'date-fns/locale';
-import { useI18n } from 'vue-i18n';
+import i18n from '@/plugins/i18n/i18n';
 
 export type I18nLocale = 'en' | 'fr' | 'ja';
 
@@ -21,7 +21,7 @@ function i18n2DateLocale(i18nLocale: I18nLocale): Locale {
 }
 
 function _dateFnsFormat(value: string, formatter: string) {
-  const { locale } = useI18n();
+  const locale: any = i18n.global?.locale || '';
   const formatted = '';
   try {
     if (value) {

diff --git a/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTenantsStore.ts b/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTenantsStore.ts
@@ -155,7 +155,7 @@ export const useInnkeeperTenantsStore = defineStore('innkeeperTenants', () => {
       })
       .catch((err) => {
         error.value = err;
-        console.log(error.value);
+        console.error(error.value);
       })
       .finally(() => {
         loading.value = false;
@@ -201,7 +201,7 @@ export const useInnkeeperTenantsStore = defineStore('innkeeperTenants', () => {
       })
       .catch((err) => {
         error.value = err;
-        console.log(error.value);
+        console.error(error.value);
       })
       .finally(() => {
         loading.value = false;
@@ -244,7 +244,7 @@ export const useInnkeeperTenantsStore = defineStore('innkeeperTenants', () => {
       })
       .catch((err) => {
         error.value = err;
-        console.log(error.value);
+        console.error(error.value);
       })
       .finally(() => {
         loading.value = false;

diff --git a/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTokenStore.ts b/services/tenant-ui/frontend/src/store/innkeeper/innkeeperTokenStore.ts
@@ -51,7 +51,7 @@ export const useInnkeeperTokenStore = defineStore(
         })
         .catch((err) => {
           error.value = err;
-          console.log(error.value);
+          console.error(error.value);
         })
         .finally(() => {
           loading.value = false;

diff --git a/services/tenant-ui/frontend/src/store/reservationStore.ts b/services/tenant-ui/frontend/src/store/reservationStore.ts
@@ -63,7 +63,7 @@ export const useReservationStore = defineStore('reservation', () => {
       })
       .catch((err) => {
         error.value = err;
-        console.log(error.value);
+        console.error(error.value);
       })
       .finally(() => {
         if (!reservation.value?.reservation_pwd) {
@@ -139,7 +139,7 @@ export const useReservationStore = defineStore('reservation', () => {
           status.value = RESERVATION_STATUSES.NOT_FOUND;
         } else {
           error.value = err;
-          console.log(error.value);
+          console.error(error.value);
         }
       })
       .finally(() => {
@@ -171,7 +171,7 @@ export const useReservationStore = defineStore('reservation', () => {
       })
       .catch((err) => {
         error.value = err;
-        console.log(error.value);
+        console.error(error.value);
       })
       .finally(() => {
         loading.value = false;

diff --git a/services/tenant-ui/frontend/src/store/tenantStore.ts b/services/tenant-ui/frontend/src/store/tenantStore.ts
@@ -98,7 +98,7 @@ export const useTenantStore = defineStore('tenant', () => {
         (res): res is PromiseRejectedResult => res.status === 'rejected'
       );
       if (errors?.length) {
-        console.log(errors);
+        console.error(errors);
         throw Error(errors[0]?.reason);
       }
     }

diff --git a/services/tenant-ui/frontend/src/store/tokenStore.ts b/services/tenant-ui/frontend/src/store/tokenStore.ts
@@ -44,7 +44,7 @@ export const useTokenStore = defineStore('token', () => {
       })
       .catch((err) => {
         error.value = err;
-        console.log(error.value);
+        console.error(error.value);
       })
       .finally(() => {
         loading.value = false;

diff --git a/services/tenant-ui/frontend/src/store/verifierStore.ts b/services/tenant-ui/frontend/src/store/verifierStore.ts
@@ -61,7 +61,7 @@ export const useVerifierStore = defineStore('verifier', () => {
       );
       listPresentations();
     } catch (err) {
-      console.log(err);
+      console.error(err);
       error.value = err;
     } finally {
       loading.value = false;

diff --git a/services/tenant-ui/frontend/test/setupGlobalMocks.ts b/services/tenant-ui/frontend/test/setupGlobalMocks.ts
@@ -76,6 +76,7 @@ vi.mock('@/store', () => ({
 }));
 
 vi.mock('vue-i18n', () => ({
+  createI18n: vi.fn(() => ({})),
   useI18n: vi.fn(() => ({
     locale: vi.fn(() => 'en'),
     t: vi.fn((key: string) => key),