From 2ab0f8f4cbc9ee9f1baf0bb66d9db7c42cfe0c71 Mon Sep 17 00:00:00 2001 From: Stanislav Volar Date: Thu, 28 Nov 2024 23:25:03 +0100 Subject: [PATCH] Updates features (#197) * asset filters from common * translations * update deps * update authors and keywords dropdown * update authors add reviewed flag * update deps * update grid item width * add refresh button to upload queue item * author and keyword dropdown update * fix * main file single use * author and keyword validations * update deps * fix * fix * update deps * update deps * update deps * fix dialog for licence switch * fix dialog for licence switch * fix dialog for licence switch --------- Co-authored-by: volar --- package.json | 8 +- src/locales/sk/system.json | 2 +- .../AssetToolbarExtSystemLicenceDialog.vue | 26 +++- .../AssetLicenceByExtIdRemoteAutocomplete.vue | 24 ++- yarn.lock | 141 +++++++++--------- 5 files changed, 113 insertions(+), 88 deletions(-) diff --git a/package.json b/package.json index 78913114..9c60123c 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "cy:open": "CYPRESS_CACHE_FOLDER='node_modules/.cache/Cypress' yarn cypress open -C cypress/config/cypress.config.ts" }, "dependencies": { - "@anzusystems/common-admin": "1.47.0-beta.102", + "@anzusystems/common-admin": "1.47.0-beta.103", "@mdi/font": "7.4.47", "@vuelidate/core": "^2.0.3", "@vuelidate/validators": "^2.0.4", @@ -30,10 +30,10 @@ "axios": "^1.7.8", "cropperjs": "^1.6.2", "jwt-decode": "^4.0.0", - "pinia": "^2.2.7", + "pinia": "^2.2.8", "rusha": "^0.8.14", "socket.io-client": "^4.8.1", - "sortablejs": "^1.15.5", + "sortablejs": "^1.15.6", "universal-cookie": "^7.2.2", "uuid": "^11.0.3", "vue": "3.5.13", @@ -65,7 +65,7 @@ "postcss-html": "^1.7.0", "prettier": "^3.4.1", "sass": "^1.81.0", - "stylelint": "^16.10.0", + "stylelint": "^16.11.0", "stylelint-config-recommended-vue": "^1.5.0", "stylelint-config-standard-scss": "^13.1.0", "typescript": "5.5.4", diff --git a/src/locales/sk/system.json b/src/locales/sk/system.json index 7316838c..5d269f06 100644 --- a/src/locales/sk/system.json +++ b/src/locales/sk/system.json @@ -51,7 +51,7 @@ "podcasts": "Podcasty", "videoShows": "Video relácie", "extSystemLicenceSwitch": { - "filters": "filtre", + "filters": "Filtre", "filter": { "extSystemName": "Meno externého systému", "extSystemId": "ID externého systému", diff --git a/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue b/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue index 650712e1..0053a832 100644 --- a/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue +++ b/src/views/coreDam/asset/components/toolbar/AssetToolbarExtSystemLicenceDialog.vue @@ -21,7 +21,7 @@ import { isUndefined, useAlerts, useDamConfigStore, - useValidate + useValidate, } from '@anzusystems/common-admin' import useVuelidate, { type ErrorObject } from '@vuelidate/core' import { storeToRefs } from 'pinia' @@ -65,6 +65,7 @@ const selectedLicence = ref(null) const selectedExtSystemSearch = ref(null) const selectedLicenceSearch = ref(null) +const selectedLicenceSearchByExtId = ref(null) const extSystemsItems = computed(() => { if (currentUser.value && currentUser.value.userToExtSystemsDto.length > 0) { @@ -147,6 +148,7 @@ const onConfirm = async () => { } const onSelectedExtSystemSearchChange = (value: IntegerIdNullable | IntegerId[]) => { + selectedLicenceSearch.value = null if (isArray(value) && value[0]) { selectedExtSystem.value = value[0] selectedLicence.value = null @@ -166,6 +168,18 @@ const onSelectedLicenceSearchChange = (value: IntegerIdNullable | IntegerId[]) = if (isInt(value) || isNull(value)) selectedLicence.value = value } +const onSelectedLicenceSearchByExtIdChange = (value: IntegerIdNullable | IntegerId[]) => { + if (isArray(value) && value[0]) { + selectedLicence.value = value[0] + selectedLicenceSearch.value = value[0] + return + } + if (isInt(value) || isNull(value)) { + selectedLicence.value = value + selectedLicenceSearch.value = value + } +} + onMounted(async () => { selectedExtSystem.value = currentExtSystemId.value selectedLicence.value = currentAssetLicenceId.value @@ -188,10 +202,10 @@ onMounted(async () => {
{{ t('system.mainBar.extSystemLicenceSwitch.currentExtSystem') }}: {{ currentExtSystemId }} ({{ extSystemName - }})
+ }})
{{ t('system.mainBar.extSystemLicenceSwitch.currentLicence') }}: {{ currentAssetLicenceId }} ({{ licenceName - }})
+ }})
{ -
+
{{ t('system.mainBar.extSystemLicenceSwitch.changeToLicenceId') }}: *
diff --git a/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue b/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue index 4e3a76ae..2e006afd 100644 --- a/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue +++ b/src/views/coreDam/assetLicence/components/AssetLicenceByExtIdRemoteAutocomplete.vue @@ -1,6 +1,14 @@