From 5f43439b262ca09223e463737cb77cf57eff9576 Mon Sep 17 00:00:00 2001 From: "kavita.sonawane@t-systems.com" Date: Tue, 15 Nov 2022 11:27:46 +0530 Subject: [PATCH 1/6] Filelist:-Deselecting all files checkboxes within cells of encrypted folder Signed-off-by: kavita.sonawane@t-systems.com --- apps/files/js/filelist.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 3530cb6630161..b74e5f5bd5b16 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -993,6 +993,7 @@ // Select only visible checkboxes to filter out unmatched file in search this.$fileList.find('td.selection > .selectCheckBox:visible').prop('checked', checked) .closest('tr').toggleClass('selected', checked); + this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); if (checked) { for (var i = 0; i < this.files.length; i++) { @@ -1001,7 +1002,7 @@ var fileData = this.files[i]; var fileRow = this.$fileList.find('tr[data-id=' + fileData.id + ']'); // do not select already selected ones - if (!fileRow.hasClass('hidden') && _.isUndefined(this._selectedFiles[fileData.id])) { + if (!fileRow.hasClass('hidden') && _.isUndefined(this._selectedFiles[fileData.id]) && (!fileData.isEncrypted)) { this._selectedFiles[fileData.id] = fileData; this._selectionSummary.add(fileData); } From 29b672bbc4f4cadf78682fbd530420cbba42bd55 Mon Sep 17 00:00:00 2001 From: "kavita.sonawane@t-systems.com" Date: Tue, 15 Nov 2022 17:58:57 +0530 Subject: [PATCH 2/6] Add comments for prevents the selection of encrypted folders Signed-off-by: kavita.sonawane@t-systems.com --- apps/files/js/filelist.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index b74e5f5bd5b16..de26f9c782b0f 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -993,6 +993,7 @@ // Select only visible checkboxes to filter out unmatched file in search this.$fileList.find('td.selection > .selectCheckBox:visible').prop('checked', checked) .closest('tr').toggleClass('selected', checked); + //For prevents the selection of encrypted folders when clicking on the "Select all" checkbox this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); if (checked) { From 7650732af7a3f8caffb987e2d97fe90f3c513a31 Mon Sep 17 00:00:00 2001 From: "kavita.sonawane@t-systems.com" Date: Wed, 16 Nov 2022 11:42:50 +0530 Subject: [PATCH 3/6] Deactivates the possiblility to checkmark or click on the encrypted folder Signed-off-by: kavita.sonawane@t-systems.com --- apps/files/css/files.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss index 2c9be4ef3fe35..a1ce0ef4910f2 100644 --- a/apps/files/css/files.scss +++ b/apps/files/css/files.scss @@ -90,6 +90,11 @@ color: var(--color-text-maxcontrast); } } + + // Deactivates the possiblility to checkmark or click on the encrypted folder + tr[data-e2eencrypted="true"] { + pointer-events: none; + } } } From 4cccb99e09c721d49b8b0cd73b849d9cc0038abf Mon Sep 17 00:00:00 2001 From: "kavita.sonawane@t-systems.com" Date: Thu, 17 Nov 2022 11:31:07 +0530 Subject: [PATCH 4/6] Prevents the selection of encrypted folder on scroll page Signed-off-by: kavita.sonawane@t-systems.com --- apps/files/js/filelist.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index de26f9c782b0f..09711f7547db8 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -993,7 +993,7 @@ // Select only visible checkboxes to filter out unmatched file in search this.$fileList.find('td.selection > .selectCheckBox:visible').prop('checked', checked) .closest('tr').toggleClass('selected', checked); - //For prevents the selection of encrypted folders when clicking on the "Select all" checkbox + // For prevents the selection of encrypted folders when clicking on the "Select all" checkbox this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); if (checked) { @@ -1288,6 +1288,7 @@ _onScroll: function(e) { if (this.$container.scrollTop() + this.$container.height() > this.$el.height() - 300) { this._nextPage(true); + this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); } }, From 323b4a6df1325c2fecd5639a25cb76d48b240d0a Mon Sep 17 00:00:00 2001 From: "kavita.sonawane@t-systems.com" Date: Fri, 18 Nov 2022 14:46:50 +0530 Subject: [PATCH 5/6] Prevents the selection of encrypted folder on next page load Signed-off-by: kavita.sonawane@t-systems.com --- apps/files/js/filelist.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 09711f7547db8..215a4509be3ea 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1288,7 +1288,6 @@ _onScroll: function(e) { if (this.$container.scrollTop() + this.$container.height() > this.$el.height() - 300) { this._nextPage(true); - this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); } }, @@ -1439,6 +1438,7 @@ hidden = false; } tr = this._renderRow(fileData, {updateSummary: false, silent: true, hidden: hidden}); + this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); this.$fileList.append(tr); if (isAllSelected || this._selectedFiles[fileData.id]) { tr.addClass('selected'); From 3dd01de38a06ac8ba8f3f3f6ee40adedbcf3d4d1 Mon Sep 17 00:00:00 2001 From: "kavita.sonawane@t-systems.com" Date: Mon, 21 Nov 2022 11:55:25 +0530 Subject: [PATCH 6/6] Prevent selection of encrypted folders Signed-off-by: kavita.sonawane@t-systems.com --- apps/files/js/filelist.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 215a4509be3ea..2261c15bc50ca 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -1438,7 +1438,10 @@ hidden = false; } tr = this._renderRow(fileData, {updateSummary: false, silent: true, hidden: hidden}); - this.$fileList.find('tr[data-e2eencrypted="true"]').find('td.selection > .selectCheckBox:visible').prop('checked', false).closest('tr').toggleClass('selected', false); + if (tr.attr('data-e2eencrypted') === 'true') { + tr.toggleClass('selected', false); + tr.find('td.selection > .selectCheckBox:visible').prop('checked', false); + } this.$fileList.append(tr); if (isAllSelected || this._selectedFiles[fileData.id]) { tr.addClass('selected');