diff --git a/client/web/admin/src/themes/corteza-base/custom.scss b/client/web/admin/src/themes/corteza-base/custom.scss index 24f3f52dc..8871ffde5 100644 --- a/client/web/admin/src/themes/corteza-base/custom.scss +++ b/client/web/admin/src/themes/corteza-base/custom.scss @@ -76,67 +76,6 @@ th { .b-table-sticky-header > .table.b-table > thead > tr > th { border: 0; } -.v-select { - min-width: auto; - position: relative; - -ms-flex: 1 1 auto; - flex: 1 1 auto; - margin-bottom: 0; - font-size: 0.9rem; - border-radius: 0.25rem; - - .vs__selected-options { - // do not allow growing - width: 0; - } - - .vs__selected { - display: block; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 100%; - overflow: hidden; - } - - .vs__search { - margin-top: 0.375rem; - } - - &:not(.vs--open) .vs__selected + .vs__search { - // force this to not use any space - // we still need it to be rendered for the focus - width: 0; - padding: 0; - margin: 0; - border: none; - height: 0; - } - - .vs__dropdown-toggle { - padding: 0.375rem; - padding-top: 0; - border-width: 2px; - border-color: var(--light); - - .vs__selected { - margin-top: 0.375rem; - } - - .vs__actions { - padding-top: 0.375rem; - } - } - - .vs__clear, - .vs__open-indicator { - fill: var(--gray-900); - display: inline-flex; - } -} - -.vs__dropdown-menu { - z-index: 1090; -} .loader { height: calc(100vh - 2 * #{var(--topbar-height)}); diff --git a/client/web/compose/src/themes/corteza-base/custom.scss b/client/web/compose/src/themes/corteza-base/custom.scss index 16f3ae27e..72615cc13 100644 --- a/client/web/compose/src/themes/corteza-base/custom.scss +++ b/client/web/compose/src/themes/corteza-base/custom.scss @@ -233,20 +233,11 @@ fieldset.required { bottom: 75px; } -.vs__spinner, .vs__spinner::after { - width: 4em; - height: 4em; -} - // to remove the gap on top of the sticky header table .b-table-sticky-header > .table.b-table > thead > tr > th { border: 0; } -.vs__actions { - padding-top: 0; -} - .modal-content { &.card { background-color: var(--white); diff --git a/client/web/discovery/src/themes/corteza-base/custom.scss b/client/web/discovery/src/themes/corteza-base/custom.scss index 8c8670033..39a5caf58 100644 --- a/client/web/discovery/src/themes/corteza-base/custom.scss +++ b/client/web/discovery/src/themes/corteza-base/custom.scss @@ -59,68 +59,6 @@ th { overflow-y: auto; } -.v-select { - min-width: auto; - position: relative; - -ms-flex: 1 1 auto; - flex: 1 1 auto; - margin-bottom: 0; - font-size: 0.9rem; - border-radius: 0.25rem; - - .vs__selected-options { - // do not allow growing - width: 0; - } - - .vs__selected { - display: block; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 100%; - overflow: hidden; - } - - .vs__search { - margin-top: 0.375rem; - } - - &:not(.vs--open) .vs__selected + .vs__search { - // force this to not use any space - // we still need it to be rendered for the focus - width: 0; - padding: 0; - margin: 0; - border: none; - height: 0; - } - - .vs__dropdown-toggle { - padding: 0.375rem; - padding-top: 0; - border-width: 2px; - border-color: var(--light); - - .vs__selected { - margin-top: 0.375rem; - } - - .vs__actions { - padding-top: 0.375rem; - } - } - - .vs__clear, - .vs__open-indicator { - fill: var(--gray-900); - display: inline-flex; - } -} - -.vs__dropdown-menu { - z-index: 1090; -} - .ProseMirror.ProseMirror-focused { outline: none; } @@ -252,11 +190,6 @@ fieldset.required { bottom: 75px; } -.vs__spinner, .vs__spinner::after { - width: 4em; - height: 4em; -} - .custom-control-label { width: 100%; margin-top: 0.25rem; diff --git a/client/web/one/src/themes/corteza-base/custom.scss b/client/web/one/src/themes/corteza-base/custom.scss index f7f02e13a..9263409ff 100644 --- a/client/web/one/src/themes/corteza-base/custom.scss +++ b/client/web/one/src/themes/corteza-base/custom.scss @@ -52,34 +52,6 @@ b, font-family: var(--font-semibold); } -.v-select { - min-width: 250px; - - .vs__search { - margin: 0; - - &:focus { - margin: 0; - } - } - - .vs__dropdown-toggle { - padding: 0.375rem; - border-width: 2px; - border-color: var(--light); - - .vs__selected { - margin: 0; - } - } - - .vs__clear, - .vs__open-indicator { - fill: var(--gray-900); - display: inline-flex; - } -} - // Supporting CSS to improve print-to-PDF option @media print { @page { diff --git a/client/web/privacy/src/themes/corteza-base/custom.scss b/client/web/privacy/src/themes/corteza-base/custom.scss index 87fc8e7df..53b86a8db 100644 --- a/client/web/privacy/src/themes/corteza-base/custom.scss +++ b/client/web/privacy/src/themes/corteza-base/custom.scss @@ -59,68 +59,6 @@ th { overflow-y: auto; } -.v-select { - min-width: auto; - position: relative; - -ms-flex: 1 1 auto; - flex: 1 1 auto; - margin-bottom: 0; - font-size: 0.9rem; - border-radius: 0.25rem; - - .vs__selected-options { - // do not allow growing - width: 0; - } - - .vs__selected { - display: block; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 100%; - overflow: hidden; - } - - .vs__search { - margin-top: 0.375rem; - } - - &:not(.vs--open) .vs__selected + .vs__search { - // force this to not use any space - // we still need it to be rendered for the focus - width: 0; - padding: 0; - margin: 0; - border: none; - height: 0; - } - - .vs__dropdown-toggle { - padding: 0.375rem; - padding-top: 0; - border-width: 2px; - border-color: var(--light); - - .vs__selected { - margin-top: 0.375rem; - } - - .vs__actions { - padding-top: 0.375rem; - } - } - - .vs__clear, - .vs__open-indicator { - fill: var(--gray-900); - display: inline-flex; - } -} - -.vs__dropdown-menu { - z-index: 1090; -} - .ProseMirror.ProseMirror-focused { outline: none; } @@ -252,11 +190,6 @@ fieldset.required { bottom: 75px; } -.vs__spinner, .vs__spinner::after { - width: 4em; - height: 4em; -} - .card-hover-popup { transition: all 0.1s ease-in-out; diff --git a/client/web/privacy/src/views/Privacy/DataOverview/Application.vue b/client/web/privacy/src/views/Privacy/DataOverview/Application.vue index 8f73acf37..4a332f86e 100644 --- a/client/web/privacy/src/views/Privacy/DataOverview/Application.vue +++ b/client/web/privacy/src/views/Privacy/DataOverview/Application.vue @@ -15,7 +15,7 @@ class="mb-0" >
{{ $t('no-data-available') }} @@ -44,7 +44,7 @@

{{ $t('request-deletion') }} @@ -78,7 +78,7 @@ variant="primary" size="lg" class="ml-1" - @click="$router.push({ name: 'request.create', params: { kind: 'correct', connectionObj } })" + @click="$router.push({ name: 'request.create', params: { kind: 'correct', connection } })" > {{ $t('request-correction') }} @@ -111,22 +111,24 @@ export default { sensitiveData: true, }, - connection: undefined, + connectionID: undefined, connections: [], modules: {}, - - connectionObj: {}, } }, + computed: { + connection () { + return this.connections.find(({ connectionID }) => connectionID === this.connectionID) || {} + }, + }, + watch: { - connection: { + connectionID: { handler (connectionID = '') { - console.log('connection', connectionID) this.fetchSensitiveData(connectionID) - this.connectionObj = this.connections.find(({ connectionID: id }) => id === connectionID) || {} }, }, }, @@ -142,7 +144,8 @@ export default { this.$SystemAPI.dataPrivacyConnectionList() .then(({ set = [] }) => { this.connections = set - this.connection = set[0].connectionID + const { connectionID } = set[0] || {} + this.connectionID = connectionID }) .catch(this.toastErrorHandler(this.$t('notification:connection-load-failed'))) .finally(() => { @@ -151,7 +154,6 @@ export default { }, fetchSensitiveData (connectionID) { - console.log('fetchSensitiveData', connectionID) if (connectionID) { this.processing.sensitiveData = true diff --git a/client/web/reporter/src/themes/corteza-base/custom.scss b/client/web/reporter/src/themes/corteza-base/custom.scss index 0f2807ecb..25fa8eb59 100644 --- a/client/web/reporter/src/themes/corteza-base/custom.scss +++ b/client/web/reporter/src/themes/corteza-base/custom.scss @@ -59,68 +59,6 @@ th { overflow-y: auto; } -.v-select { - min-width: auto; - position: relative; - -ms-flex: 1 1 auto; - flex: 1 1 auto; - margin-bottom: 0; - font-size: 0.9rem; - border-radius: 0.25rem; - - .vs__selected-options { - // do not allow growing - width: 0; - } - - .vs__selected { - display: block; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 100%; - overflow: hidden; - } - - .vs__search { - margin-top: 0.375rem; - } - - &:not(.vs--open) .vs__selected + .vs__search { - // force this to not use any space - // we still need it to be rendered for the focus - width: 0; - padding: 0; - margin: 0; - border: none; - height: 0; - } - - .vs__dropdown-toggle { - padding: 0.375rem; - padding-top: 0; - border-width: 2px; - border-color: var(--light); - - .vs__selected { - margin-top: 0.375rem; - } - - .vs__actions { - padding-top: 0.375rem; - } - } - - .vs__clear, - .vs__open-indicator { - fill: var(--gray-900); - display: inline-flex; - } -} - -.vs__dropdown-menu { - z-index: 1090; -} - .ProseMirror.ProseMirror-focused { outline: none; } @@ -252,11 +190,6 @@ fieldset.required { bottom: 75px; } -.vs__spinner, .vs__spinner::after { - width: 4em; - height: 4em; -} - .gap-1 { gap: 0.5rem; } diff --git a/client/web/workflow/src/themes/corteza-base/custom.scss b/client/web/workflow/src/themes/corteza-base/custom.scss index 2303e28de..507c21a14 100644 --- a/client/web/workflow/src/themes/corteza-base/custom.scss +++ b/client/web/workflow/src/themes/corteza-base/custom.scss @@ -59,68 +59,6 @@ th { overflow-y: auto; } -.v-select { - min-width: auto; - position: relative; - -ms-flex: 1 1 auto; - flex: 1 1 auto; - margin-bottom: 0; - font-size: 0.9rem; - border-radius: 0.25rem; - - .vs__selected-options { - // do not allow growing - width: 0; - } - - .vs__selected { - display: block; - white-space: nowrap; - text-overflow: ellipsis; - max-width: 100%; - overflow: hidden; - } - - .vs__search { - margin-top: 0.375rem; - } - - &:not(.vs--open) .vs__selected + .vs__search { - // force this to not use any space - // we still need it to be rendered for the focus - width: 0; - padding: 0; - margin: 0; - border: none; - height: 0; - } - - .vs__dropdown-toggle { - padding: 0.375rem; - padding-top: 0; - border-width: 2px; - border-color: var(--light); - - .vs__selected { - margin-top: 0.375rem; - } - - .vs__actions { - padding-top: 0.375rem; - } - } - - .vs__clear, - .vs__open-indicator { - fill: var(--gray-900); - display: inline-flex; - } -} - -.vs__dropdown-menu { - z-index: 1090; -} - .loader { height: calc(100vh - 2 * #{var(--topbar-height)}); display: flex; @@ -259,11 +197,6 @@ fieldset.required { bottom: 75px; } -.vs__spinner, .vs__spinner::after { - width: 4em; - height: 4em; -} - .gap-1 { gap: 0.5rem; } diff --git a/lib/vue/src/components/input/CInputSelect.vue b/lib/vue/src/components/input/CInputSelect.vue index 98cfaa36c..74291d622 100644 --- a/lib/vue/src/components/input/CInputSelect.vue +++ b/lib/vue/src/components/input/CInputSelect.vue @@ -92,7 +92,7 @@ export default { }, methods: { - calculateDropdownPosition (dropdownList, component, { width }) { + calculateDropdownPosition (dropdownList, component, { width }) { /** * We need to explicitly define the dropdown width since * it is usually inherited from the parent with CSS. @@ -139,19 +139,20 @@ export default { diff --git a/lib/vue/src/components/permissions/CPermissionsModal.vue b/lib/vue/src/components/permissions/CPermissionsModal.vue index a39c7c0cf..26e0daeaf 100644 --- a/lib/vue/src/components/permissions/CPermissionsModal.vue +++ b/lib/vue/src/components/permissions/CPermissionsModal.vue @@ -70,7 +70,7 @@ v-for="(n, index) in getEvalName(e)" :key="index" :title="n" - class="pointer text-center text-primary text-break mb-1" + class="pointer text-center text-primary mb-1" > {{ n }} @@ -88,7 +88,7 @@ class="d-none d-lg-flex pointer border-bottom flex-column align-items-center justify-content-center overflow-hidden border-left p-3" > @@ -136,7 +136,7 @@