From f83979188dedfec9c1b26547f6f73196d6e7cb72 Mon Sep 17 00:00:00 2001 From: volar Date: Tue, 31 Oct 2023 14:52:16 +0100 Subject: [PATCH 01/35] datatable fixed to new version --- package.json | 76 +- src/styles/components/dam-upload-queue.scss | 6 +- .../anzuUser/components/AnzuUserDatatable.vue | 28 +- .../common/log/components/LogDatatable.vue | 22 +- .../components/PermissionGroupDatatable.vue | 18 +- .../components/AssetLicenceDatatable.vue | 18 +- .../author/components/AuthorDatatable.vue | 18 +- .../DistributionCategoryDatatable.vue | 16 +- .../DistributionCategorySelectDatatable.vue | 16 +- .../components/ExtSystemDatatable.vue | 16 +- .../coreDam/job/components/JobDatatable.vue | 22 +- .../keyword/components/KeywordDatatable.vue | 18 +- .../podcast/components/PodcastDatatable.vue | 18 +- .../components/PodcastEpisodeDatatable.vue | 16 +- .../coreDam/user/components/UserDatatable.vue | 16 +- .../components/VideoShowDatatable.vue | 16 +- .../components/VideoShowEpisodeDatatable.vue | 16 +- yarn.lock | 2327 ++++++++++------- 18 files changed, 1488 insertions(+), 1195 deletions(-) diff --git a/package.json b/package.json index 0b4a2ff6..04d7c992 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adam-admin", - "packageManager": "yarn@3.5.0", + "packageManager": "yarn@3.6.4", "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.33.0", + "@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", + "@vuelidate/validators": "^2.0.4", + "@vueuse/core": "10.5.0", + "@vueuse/integrations": "10.5.0", + "axios": "^1.6.0", + "core-js": "^3.33.1", "js-sha1": "^0.6.0", - "jwt-decode": "^3.1.2", - "pinia": "^2.1.4", + "jwt-decode": "^4.0.0", + "pinia": "^2.1.7", "sortablejs": "^1.15.0", - "universal-cookie": "^4.0.4", - "uuid": "^9.0.0", - "vue": "^3.3.4", + "universal-cookie": "^6.1.1", + "uuid": "^9.0.1", + "vue": "^3.3.7", "vue-cropperjs": "^5.0.0", - "vue-i18n": "^9.2.2", - "vue-router": "^4.2.2", - "vuetify": "^3.3.6" + "vue-i18n": "^9.6.2", + "vue-router": "^4.2.5", + "vuetify": "^3.3.23" }, "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.4.0", + "@rushstack/eslint-patch": "^1.5.1", + "@types/node": "^18.18.7", + "@types/sortablejs": "^1.15.4", + "@types/uuid": "^9.0.6", + "@typescript-eslint/parser": "^6.9.0", + "@vitejs/plugin-vue": "^4.4.0", + "@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.3.3", "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.6.1", + "eslint": "8.52.0", + "eslint-plugin-cypress": "^2.15.1", + "eslint-plugin-vue": "^9.18.1", "npm-run-all": "^4.1.5", "postcss": "^8.4.31", "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.0.3", + "sass": "^1.69.5", + "stylelint": "^15.11.0", + "stylelint-config-recommended-vue": "^1.5.0", + "stylelint-config-standard-scss": "^11.0.0", "typescript": "^4.9.5", - "vite": "^4.3.9", + "vite": "^4.5.0", "vite-plugin-vuetify": "^1.0.2", - "vue-tsc": "1.8.3" + "vue-tsc": "1.8.22" } } diff --git a/src/styles/components/dam-upload-queue.scss b/src/styles/components/dam-upload-queue.scss index b39044b5..90a0a7ad 100644 --- a/src/styles/components/dam-upload-queue.scss +++ b/src/styles/components/dam-upload-queue.scss @@ -47,8 +47,7 @@ $duplicate-bg-color-dark: rgb(0 0 0 / 70%); } .#{$class-name-root} { - overflow-x: auto; - overflow-y: hidden; + overflow: auto hidden; margin-top: 1px; &--simple { @@ -69,8 +68,7 @@ $duplicate-bg-color-dark: rgb(0 0 0 / 70%); } &--list { - overflow-x: hidden; - overflow-y: auto; + overflow: hidden auto; .#{$class-name-root}__item { min-width: auto; diff --git a/src/views/common/anzuUser/components/AnzuUserDatatable.vue b/src/views/common/anzuUser/components/AnzuUserDatatable.vue index 7830c33d..5885f8ee 100644 --- a/src/views/common/anzuUser/components/AnzuUserDatatable.vue +++ b/src/views/common/anzuUser/components/AnzuUserDatatable.vue @@ -27,7 +27,7 @@ import { usePermissionConfigActions } from '@/views/common/permission/composable import CachedPermissionGroupChip from '@/views/common/permissionGroup/components/CachedPermissionGroupChip.vue' import { damClient } from '@/services/api/clients/damClient' -type DatatableItem = { raw: AnzuUser } +type DatatableItem = AnzuUser const router = useRouter() @@ -37,8 +37,8 @@ const { fetchAnzuUserList, anzuUserList, datatableHiddenColumns } = useAnzuUserA const { can } = useAcl() const onRowClick = (event: unknown, { item }: { item: DatatableItem }) => { - if (item.raw.id && can(ACL.DAM_USER_VIEW)) { - router.push({ name: ROUTE.COMMON.ANZU_USER.DETAIL, params: { id: item.raw.id } }) + if (item.id && can(ACL.DAM_USER_VIEW)) { + router.push({ name: ROUTE.COMMON.ANZU_USER.DETAIL, params: { id: item.id } }) } } @@ -104,49 +104,49 @@ defineExpose({