From c4bfda8bb3c7a3bb11eae41c5e2e2c2fff53fa79 Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 16 Aug 2023 15:00:10 +0200 Subject: [PATCH 1/7] Ease use of disabled in OcTable --- .../src/components/OcResource/OcResource.vue | 2 +- .../src/components/OcTable/OcTable.vue | 37 +++++++++++-------- .../components/FilesList/ResourceTable.vue | 36 ++++-------------- .../Shares/Collaborators/EditDropdown.vue | 2 +- .../src/helpers/resource/functions.ts | 2 +- 5 files changed, 31 insertions(+), 48 deletions(-) diff --git a/packages/design-system/src/components/OcResource/OcResource.vue b/packages/design-system/src/components/OcResource/OcResource.vue index c232dcf2d20..4d0358ace02 100644 --- a/packages/design-system/src/components/OcResource/OcResource.vue +++ b/packages/design-system/src/components/OcResource/OcResource.vue @@ -5,8 +5,8 @@ :resource="resource" :is-resource-clickable="isResourceClickable" :folder-link="folderLink" - @click="emitClick" class="oc-resource-link" + @click="emitClick" > , + default: () => [] }, /** * Top position of header used when the header is sticky in pixels @@ -482,15 +482,11 @@ export default defineComponent({ return this.highlighted === item[this.idKey] }, isDisabled(item) { - if (!this.disabled) { + if (!this.disabled.length) { return false } - if (Array.isArray(this.disabled)) { - return this.disabled.indexOf(item[this.idKey]) > -1 - } - - return this.disabled === item[this.idKey] + return !!this.disabled.find((i) => i[this.idKey] === item[this.idKey]) }, cellKey(field, index, item) { @@ -508,9 +504,7 @@ export default defineComponent({ }, getSortLabel(name) { - const label = this.$gettext('Sort by %{ name }') - - return this.$gettextInterpolate(label, { name }) + return this.$gettext('Sort by %{ name }', { name }) }, handleTrClick(field) { @@ -654,8 +648,13 @@ export default defineComponent({

A simple table with plain field types

- + @@ -701,8 +700,14 @@ export default defineComponent({

A sortable table with plain field types

- + diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue index 29242369702..1363b24ee99 100644 --- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue +++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue @@ -65,7 +65,7 @@ :is-thumbnail-displayed="shouldDisplayThumbnails(item)" :is-icon-displayed="!$slots['image']" :is-extension-displayed="areFileExtensionsShown" - :is-resource-clickable="isResourceClickable(item.id)" + :is-resource-clickable="isResourceClickable(item)" :folder-link="folderLink(item)" :parent-folder-link="parentFolderLink(item)" :parent-folder-link-icon-additional-attributes=" @@ -209,7 +209,7 @@ From b6ac8066bb7346b3fa03d86fc545b178e867b641 Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 16 Aug 2023 15:28:46 +0200 Subject: [PATCH 4/7] Enhance changelog item --- changelog/unreleased/enhancement-indicate-processig-state | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog/unreleased/enhancement-indicate-processig-state b/changelog/unreleased/enhancement-indicate-processig-state index e2ac6cddd23..2f171d17763 100644 --- a/changelog/unreleased/enhancement-indicate-processig-state +++ b/changelog/unreleased/enhancement-indicate-processig-state @@ -5,4 +5,5 @@ If so, no actions on this resource is possible, therefore we show now the proces the temporary restrictions clear to the user. https://github.com/owncloud/web/pull/9561 +https://github.com/owncloud/web/pull/9585 https://github.com/owncloud/web/issues/9558 From 86c7217b823dbe8a945c43de35e7fb1ab64cf527 Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 16 Aug 2023 15:51:13 +0200 Subject: [PATCH 5/7] Enhance prop desc --- packages/design-system/src/components/OcTable/OcTable.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/design-system/src/components/OcTable/OcTable.vue b/packages/design-system/src/components/OcTable/OcTable.vue index 608957ddd68..7a1288ccf55 100644 --- a/packages/design-system/src/components/OcTable/OcTable.vue +++ b/packages/design-system/src/components/OcTable/OcTable.vue @@ -221,6 +221,7 @@ export default defineComponent({ }, /** * The array of disabled data items. Empty array for no disabled items. + * Objects in array must contain a matching idKey property */ disabled: { type: Array as PropType, From 32656bb96ffae2c25d9906dabb73ab827379ffcd Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 16 Aug 2023 16:22:09 +0200 Subject: [PATCH 6/7] Move back to disabled ids --- .../src/components/OcTable/OcTable.vue | 30 +++++++------------ .../components/FilesList/ResourceTable.vue | 18 ++++++----- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/packages/design-system/src/components/OcTable/OcTable.vue b/packages/design-system/src/components/OcTable/OcTable.vue index 7a1288ccf55..575db07281a 100644 --- a/packages/design-system/src/components/OcTable/OcTable.vue +++ b/packages/design-system/src/components/OcTable/OcTable.vue @@ -220,11 +220,10 @@ export default defineComponent({ default: null }, /** - * The array of disabled data items. Empty array for no disabled items. - * Objects in array must contain a matching idKey property + * The ids of disabled data items. Empty array for no disabled items. */ disabled: { - type: Array as PropType, + type: Array as PropType>, default: () => [] }, /** @@ -487,7 +486,7 @@ export default defineComponent({ return false } - return !!this.disabled.find((i) => i[this.idKey] === item[this.idKey]) + return this.disabled.indexOf(item[this.idKey]) > -1 }, cellKey(field, index, item) { @@ -505,7 +504,9 @@ export default defineComponent({ }, getSortLabel(name) { - return this.$gettext('Sort by %{ name }', { name }) + const label = this.$gettext('Sort by %{ name }') + + return this.$gettextInterpolate(label, { name }) }, handleTrClick(field) { @@ -649,13 +650,8 @@ export default defineComponent({

A simple table with plain field types

- + @@ -701,14 +697,8 @@ export default defineComponent({

A sortable table with plain field types

- + diff --git a/packages/web-app-files/src/components/FilesList/ResourceTable.vue b/packages/web-app-files/src/components/FilesList/ResourceTable.vue index 1363b24ee99..1d390aadc00 100644 --- a/packages/web-app-files/src/components/FilesList/ResourceTable.vue +++ b/packages/web-app-files/src/components/FilesList/ResourceTable.vue @@ -65,7 +65,7 @@ :is-thumbnail-displayed="shouldDisplayThumbnails(item)" :is-icon-displayed="!$slots['image']" :is-extension-displayed="areFileExtensionsShown" - :is-resource-clickable="isResourceClickable(item)" + :is-resource-clickable="isResourceClickable(item.id)" :folder-link="folderLink(item)" :parent-folder-link="parentFolderLink(item)" :parent-folder-link-icon-additional-attributes=" @@ -209,7 +209,7 @@