wip

.github/workflows/ci.yml

@@ -27,16 +27,16 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Enable corepack
+        run: corepack enable
+
       - name: Setup Node
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'yarn'
           cache-dependency-path: 'yarn.lock'
 
-      - name: Enable corepack
-        run: corepack enable
-
       - name: Install dependencies
         run: yarn install --immutable
 

.yarnrc.yml

@@ -1 +1,5 @@
+compressionLevel: mixed
+
+enableGlobalCache: false
+
 nodeLinker: node-modules

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adam-admin",
-  "packageManager": "yarn@3.6.4",
+  "packageManager": "yarn@4.0.2",
   "license": "Apache-2.0",
   "version": "0.0.1",
   "scripts": {
@@ -21,55 +21,55 @@
     "cy:open": "CYPRESS_CACHE_FOLDER='node_modules/.cache/Cypress' yarn cypress open -C cypress/config/cypress.config.ts"
   },
   "dependencies": {
-    "@anzusystems/common-admin": "^1.5.0",
-    "@mdi/font": "7.2.96",
+    "@anzusystems/common-admin": "1.40.0-alpha10",
+    "@mdi/font": "7.3.67",
     "@vuelidate/core": "^2.0.3",
-    "@vuelidate/validators": "^2.0.3",
-    "@vueuse/core": "10.2.1",
-    "@vueuse/integrations": "10.2.1",
-    "axios": "^1.4.0",
-    "core-js": "^3.31.0",
-    "js-sha1": "^0.6.0",
-    "jwt-decode": "^3.1.2",
-    "pinia": "^2.1.4",
-    "sortablejs": "^1.15.0",
-    "universal-cookie": "^4.0.4",
-    "uuid": "^9.0.0",
-    "vue": "^3.3.4",
-    "vue-cropperjs": "^5.0.0",
-    "vue-i18n": "^9.2.2",
-    "vue-router": "^4.2.2",
-    "vuetify": "^3.3.6"
+    "@vuelidate/validators": "^2.0.4",
+    "@vueuse/core": "10.7.0",
+    "@vueuse/integrations": "10.7.0",
+    "axios": "^1.6.2",
+    "cropperjs": "^1.6.1",
+    "jwt-decode": "^4.0.0",
+    "pinia": "^2.1.7",
+    "rusha": "^0.8.14",
+    "sortablejs": "^1.15.1",
+    "universal-cookie": "^6.1.1",
+    "uuid": "^9.0.1",
+    "vue": "^3.3.11",
+    "vue-i18n": "^9.8.0",
+    "vue-router": "^4.2.5",
+    "vuetify": "^3.4.6"
   },
   "devDependencies": {
-    "@cypress/grep": "^3.1.5",
-    "@intlify/unplugin-vue-i18n": "^0.11.0",
-    "@rushstack/eslint-patch": "^1.3.2",
-    "@types/node": "^18.16.18",
-    "@types/sortablejs": "^1.15.1",
-    "@types/uuid": "^9.0.2",
-    "@typescript-eslint/parser": "^5.60.1",
-    "@vitejs/plugin-vue": "^4.2.3",
-    "@vue/eslint-config-prettier": "^7.1.0",
-    "@vue/eslint-config-typescript": "^11.0.3",
+    "@cypress/grep": "^4.0.1",
+    "@intlify/unplugin-vue-i18n": "^1.5.0",
+    "@rushstack/eslint-patch": "^1.6.0",
+    "@types/node": "^18.19.3",
+    "@types/rusha": "^0.8.3",
+    "@types/sortablejs": "^1.15.7",
+    "@types/uuid": "^9.0.7",
+    "@typescript-eslint/parser": "^6.13.2",
+    "@vitejs/plugin-vue": "^4.5.2",
+    "@vue/eslint-config-prettier": "^8.0.0",
+    "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/tsconfig": "^0.1.3",
-    "cypress": "^12.16.0",
+    "cypress": "^13.6.1",
     "cypress-downloadfile": "1.2.3",
-    "cypress-mochawesome-reporter": "^3.5.1",
-    "eslint": "8.43.0",
-    "eslint-plugin-cypress": "^2.13.3",
-    "eslint-plugin-vue": "^9.15.1",
+    "cypress-mochawesome-reporter": "^3.7.0",
+    "eslint": "8.52.0",
+    "eslint-plugin-cypress": "^2.15.1",
+    "eslint-plugin-vue": "^9.19.2",
     "npm-run-all": "^4.1.5",
-    "postcss": "^8.4.31",
+    "postcss": "^8.4.32",
     "postcss-html": "^1.5.0",
-    "prettier": "^2.8.8",
-    "sass": "^1.63.6",
-    "stylelint": "^15.9.0",
-    "stylelint-config-recommended-vue": "^1.4.0",
-    "stylelint-config-standard-scss": "^10.0.0",
+    "prettier": "^3.1.1",
+    "sass": "^1.69.5",
+    "stylelint": "^15.11.0",
+    "stylelint-config-recommended-vue": "^1.5.0",
+    "stylelint-config-standard-scss": "^11.1.0",
     "typescript": "^4.9.5",
-    "vite": "^4.3.9",
+    "vite": "^5.0.7",
     "vite-plugin-vuetify": "^1.0.2",
-    "vue-tsc": "1.8.3"
+    "vue-tsc": "1.8.25"
   }
 }

src/components/coreDam/FileUpload.vue

@@ -3,7 +3,7 @@ import { useWindowFilesDragWatcher } from '@/composables/system/windowFilesDragW
 import { computed, ref, watch } from 'vue'
 import { arrayFlatten, arrayFromArgs, isArray, isUndefined, useAlerts } from '@anzusystems/common-admin'
 import { useI18n } from 'vue-i18n'
-import { fileTypeFix } from '@/services/fileType'
+import { damFileTypeFix } from '@anzusystems/common-admin'
 
 type InputRef = null | HTMLInputElement
 
@@ -180,9 +180,9 @@ const checkFormats = (file: File, accepts: string[]) => {
     } else {
       // type
       const splitType = accepts[i].split('/')
-      if (splitType[1] === '*' && fileTypeFix(file).startsWith(splitType[0] + '/')) {
+      if (splitType[1] === '*' && damFileTypeFix(file).startsWith(splitType[0] + '/')) {
         return true
-      } else if (accepts[i] === fileTypeFix(file)) {
+      } else if (accepts[i] === damFileTypeFix(file)) {
         return true
       }
     }
@@ -203,9 +203,9 @@ const checkSizes = (file: File, keys: Array<string>, sizes: Record<string, numbe
     } else {
       // type
       const splitType = keys[j].split('/')
-      if (splitType[1] === '*' && fileTypeFix(file).startsWith(splitType[0] + '/') && sizes[keys[j]] > file.size) {
+      if (splitType[1] === '*' && damFileTypeFix(file).startsWith(splitType[0] + '/') && sizes[keys[j]] > file.size) {
         return true
-      } else if (keys[j] === fileTypeFix(file) && sizes[keys[j]] > file.size) {
+      } else if (keys[j] === damFileTypeFix(file) && sizes[keys[j]] > file.size) {
         return true
       }
     }
@@ -292,9 +292,7 @@ watch(selectedFiles, (newValue, oldValue) => {
       @click.stop="clickDropzone"
     >
       <template #prepend>
-        <VIcon
-          icon="mdi-upload"
-        />
+        <VIcon icon="mdi-upload" />
       </template>
       {{ buttonText }}
     </VBtn>