Merge branch 'main' into #280-i18n-update

hotwax · Dec 5, 2024 · 0e02a1c · 0e02a1c
2 parents f7787a8 + 1794c22
commit 0e02a1c
Show file tree

Hide file tree

Showing 11 changed files with 234 additions and 101 deletions.
diff --git a/firebase.json b/firebase.json
@@ -11,7 +11,25 @@
       "rewrites": [ {
         "source": "**",
         "destination": "/index.html"
-      } ]
+      } ],
+      "headers": [ {
+        "source": "**",
+        "headers": [ {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN"
+        },
+        {
+          "key": "Content-Security-Policy",
+          "value": "default-src 'self';font-src 'self' data: *;script-src 'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com;img-src 'self' 'unsafe-inline' *.shopify.com javascript: ;style-src 'self' 'unsafe-inline' *; connect-src 'self' *"
+        },
+        {
+          "key": "strict-transport-security",
+          "value": "max-age=31536000; includeSubDomains"
+        },{
+          "key": "Permissions-Policy",
+          "value": "camera=self"
+        } ]
+      }]
     },
     {
       "target": "prod",
@@ -24,7 +42,25 @@
       "rewrites": [ {
         "source": "**",
         "destination": "/index.html"
-      } ]
+      } ],
+      "headers": [ {
+        "source": "**",
+        "headers": [ {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN"
+        },
+        {
+          "key": "Content-Security-Policy",
+          "value": "default-src 'self';font-src 'self' data: *;script-src 'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com;img-src 'self' 'unsafe-inline' *.shopify.com javascript: ;style-src 'self' 'unsafe-inline' *; connect-src 'self' *"
+        },
+        {
+          "key": "strict-transport-security",
+          "value": "max-age=31536000; includeSubDomains"
+        },{
+          "key": "Permissions-Policy",
+          "value": "camera=self"
+        } ]
+      }]
     },
     {
       "target": "uat",
@@ -37,7 +73,25 @@
       "rewrites": [ {
         "source": "**",
         "destination": "/index.html"
-      } ]
+      } ],
+      "headers": [ {
+        "source": "**",
+        "headers": [ {
+          "key": "X-Frame-Options",
+          "value": "SAMEORIGIN"
+        },
+        {
+          "key": "Content-Security-Policy",
+          "value": "default-src 'self';font-src 'self' data: *;script-src 'self' 'unsafe-inline' 'unsafe-eval' fonts.googleapis.com;img-src 'self' 'unsafe-inline' *.shopify.com javascript: ;style-src 'self' 'unsafe-inline' *; connect-src 'self' *"
+        },
+        {
+          "key": "strict-transport-security",
+          "value": "max-age=31536000; includeSubDomains"
+        },{
+          "key": "Permissions-Policy",
+          "value": "camera=self"
+        } ]
+      }]
     }
   ]
 }
diff --git a/src/authorization/Rules.ts b/src/authorization/Rules.ts
@@ -1,9 +1,9 @@
 export default {
     "APP_ORDERS_VIEW": "",
     "APP_PRODUCTS_VIEW": "",
-    "APP_CATALOG_VIEW": "",
+    "APP_AUDIT_VIEW": "",
     "APP_PRDT_DTLS_VIEW": "",
-    "APP_CTLG_PRDT_DTLS_VIEW": "",
+    "APP_AUDIT_PRDT_DTLS_VIEW": "",
     "APP_COMMERCE_VIEW": "COMMERCEUSER_VIEW",
     "MERCHANDISING_ADMIN": "MERCHANDISING_ADMIN",
     "PREORDER_APP_VIEW": "PREORDER_APP_VIEW",

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
@@ -94,13 +94,13 @@ export default defineComponent({
         }
       },
       {
-        title: "Catalog",
-        url: "/catalog",
-        childRoutes: ["/catalog-product-details/"],
+        title: "Audit",
+        url: "/audit",
+        childRoutes: ["/audit-product-details/"],
         iosIcon: albums,
         mdIcon: albums,
         meta: {
-          permissionId: "APP_CATALOG_VIEW"
+          permissionId: "APP_AUDIT_VIEW"
         }
       },
       {

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -10,6 +10,7 @@
     "Are you sure you want to update the promise date for these orders?": "Are you sure you want to update the promise date for these orders?",
     "Are you sure you want to change the time zone to?": "Are you sure you want to change the time zone to {timeZoneId}?",
     "ATP": "ATP",
+    "Audit": "Audit",
     "Auto": "Auto",
     "Auto releasing": "Auto releasing",
     "Authenticating": "Authenticating",
@@ -29,7 +30,6 @@
     "Cancel item": "Cancel item",
     "Cancel job": "Cancel job",
     "Cancel orders": "Cancel orders",
-    "Catalog": "Catalog",
     "Category": "Category",
     "Change": "Change",
     "Change time zone": "Change time zone",
@@ -86,6 +86,7 @@
     "Items queued for cancel successfully": "Items queued for cancel successfully",
     "Items queued for release successfully": "Items queued for release successfully",
     "Items queued to update promise date successfully": "Items queued to update promise date successfully",
+    "Job runtime has passed. Please refresh to get the latest job data in order to perform any action.": "Job runtime has passed. Please refresh to get the latest job data in order to perform any action.",
     "Jobs": "Jobs",
     "Last active purchase order": "Last active purchase order",
     "Listed": "Listed",
@@ -216,6 +217,7 @@
     "Stopped accepting from as there is no active PO": "Stopped accepting {category}s from {changeDatetime} as there is no active PO",
     "The job is currently in progress. Are you sure that you want to cancel this job?": "The job is currently in progress. Are you sure that you want to cancel this job?",
     "Store": "Store",
+    "The job data has been refreshed successfully.": "The job data has been refreshed successfully.",
     "The order count in product cards will be updated based on the filters you select.": "The order count in product cards will be updated based on the filters you select.",
     "The timezone you select is used to ensure automations you schedule are always accurate to the time you select.": "The timezone you select is used to ensure automations you schedule are always accurate to the time you select.",
     "There are no jobs running in the background right now.": "There are no jobs running in the background right now.",

diff --git a/src/router/index.ts b/src/router/index.ts
@@ -2,9 +2,9 @@ import { createRouter, createWebHistory } from '@ionic/vue-router';
 import { RouteRecordRaw } from 'vue-router';
 import Products from '../views/products.vue'
 import ProductDetails from '../views/product-details.vue'
-import CatalogProductDetails from '../views/catalog-product-details.vue'
+import AuditProductDetails from '../views/audit-product-details.vue'
 import Orders from '../views/orders.vue'
-import Catalog from '../views/catalog.vue'
+import Audit from '../views/audit.vue'
 import Settings from '../views/settings.vue'
 import store from '@/store';
 import { DxpLogin, useAuthStore } from '@hotwax/dxp-components';
@@ -79,21 +79,21 @@ const routes: Array<RouteRecordRaw> = [
     }
   },
   {
-    path: '/catalog',
-    name: 'Catalog',
-    component: Catalog,
+    path: '/audit',
+    name: 'Audit',
+    component: Audit,
     beforeEnter: authGuard,
     meta: {
-      permissionId: "APP_CATALOG_VIEW"
+      permissionId: "APP_AUDIT_VIEW"
     }
   },
   {
-    path: '/catalog-product-details/:productId/',
-    name: 'Catalog-product-details',
-    component: CatalogProductDetails,
+    path: '/audit-product-details/:productId/',
+    name: 'AuditProductDetails',
+    component: AuditProductDetails,
     beforeEnter: authGuard,
     meta: {
-      permissionId: "APP_CTLG_PRDT_DTLS_VIEW"
+      permissionId: "APP_AUDIT_PRDT_DTLS_VIEW"
     }
   },
   {