Skip to content

Commit

Permalink
Add trashbin ui refs #37699 (#9)
Browse files Browse the repository at this point in the history 
* Add trashbin | refs #37699

---------

Co-authored-by: sschoorens <[email protected]>
Co-authored-by: Thomas Mc Kay <[email protected]>
  • Loading branch information
@sschoorens @thomas-mckay
3 people authored Aug 10, 2023
1 parent ede0623 commit 807db37
Show file tree
Hide file tree
Showing 7 changed files with 110 additions and 7 deletions.
2 changes: 1 addition & 1 deletion dist/ms-browser.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ms-full.min.css
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ms-full.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ms-items.min.css
View file

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion src/css/ms-items.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
}
.ms-items .item-entry-layout,
.ms-items .item-entry-unlisted,
.ms-items .item-entry-in-trash,
.ms-items .item-entry-notpublished,
.ms-items .item-entry-published,
.ms-items .item-entry-notready,
Expand All @@ -135,6 +136,7 @@
}
.ms-items .item-entry-layout:before,
.ms-items .item-entry-unlisted:before,
.ms-items .item-entry-in-trash:before,
.ms-items .item-entry-notpublished:before,
.ms-items .item-entry-published:before,
.ms-items .item-entry-notready:before,
Expand Down Expand Up @@ -164,6 +166,10 @@
content: "\f070";
color: #EC804D;
}
.ms-items .item-entry-in-trash:before {
content: "\f1f8";
color: #EC804D;
}
.ms-items .item-entry-notpublished:before {
content: "\f023";
color: #FE6F5E;
Expand Down Expand Up @@ -279,6 +285,7 @@
}
.ms-items .item-entry.thumbnail .item-entry-layout,
.ms-items .item-entry.thumbnail .item-entry-unlisted,
.ms-items .item-entry.thumbnail .item-entry-in-trash,
.ms-items .item-entry.thumbnail .item-entry-notpublished,
.ms-items .item-entry.thumbnail .item-entry-published,
.ms-items .item-entry.thumbnail .item-entry-notready,
Expand Down Expand Up @@ -440,6 +447,7 @@
}
.ms-items .item-entry-layout,
.ms-items .item-entry-unlisted,
.ms-items .item-entry-in-trash,
.ms-items .item-entry-notpublished,
.ms-items .item-entry-published,
.ms-items .item-entry-notready {
Expand All @@ -465,4 +473,4 @@
0% {color: #E65959;}
50% {color: transparent;}
100% {color: #E65959;}
}
}
85 changes: 83 additions & 2 deletions src/ms-browser-display.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,7 @@ MSBrowser.prototype._cleanSpeakers = function (speakerStr) {
MSBrowser.prototype._getEntryBlockHtml = function (item, itemType, clickable, tab) {
let markup = 'span';
let href = '';
const itemInTrash = !!item.trash_data;
let buttonStyle = ' tabindex="0" role="button"';
if (!this.useOverlay && item.slug && (!this.pickMode || itemType == 'channel')) {
markup = 'a';
Expand Down Expand Up @@ -769,6 +770,17 @@ MSBrowser.prototype._getEntryBlockHtml = function (item, itemType, clickable, ta
const langHtml = this.getLangHTML(item);
topBar += '<span class="item-entry-language">' + langHtml + '</span>';
}
if (itemInTrash) {
if (item.trash_data.parent_id) {
topBar += '<span class="item-entry-in-trash" title="' +
jsu.translateAttribute('This item is in the recycle bin') + '"><span class="sr-only">' +
jsu.translateHTML('This item is in the recycle bin') + '</span></span>';
} else {
topBar += '<span class="item-entry-in-trash" title="' +
jsu.translateAttribute('This item\'s parent is in the recycle bin') + '"><span class="sr-only">' +
jsu.translateHTML('This item\'s parent is in the recycle bin') + '</span></span>';
}
}

// title
if (!this.displayAsThumbnails) {
Expand All @@ -786,6 +798,14 @@ MSBrowser.prototype._getEntryBlockHtml = function (item, itemType, clickable, ta
bottomBar += '<span class="item-entry-date">' + jsu.translateHTML('Created on') + ' ' +
jsu.getDateDisplay(item.creation) + '</span>';
}
if (itemInTrash) {
bottomBar += '<span class="item-entry-date">' + jsu.translateHTML('Deleted on') + ' ' +
jsu.getDateDisplay(item.trash_data.trashed_at.split('.')[0]) + '</span>';
if (item.trash_data.parent_title) {
bottomBar += '<span class="item-entry-description">' + jsu.translateHTML('Deleted from') +
' "' + item.trash_data.parent_title + '"</span>';
}
}
if (this.couldDisplay('description') && item.short_description) {
bottomBar += '<span class="item-entry-description">' + jsu.escapeHTML($('<span>' + item.short_description + '</span>').text()) + '</span>';
}
Expand Down Expand Up @@ -911,6 +931,8 @@ MSBrowser.prototype._setOnClickEntryBlock = function ($entryBlock, oid, itemType

MSBrowser.prototype.getEntryLinks = function (item, itemType, selectable) {
let html = '';
const isTrashBin = item.oid === 'c00000000000000trash';
const itemInTrash = !!item.trash_data;
if (this.pickMode) {
if (selectable) {
const selected = this.currentSelection && this.currentSelection.oid == item.oid;
Expand Down Expand Up @@ -960,6 +982,22 @@ MSBrowser.prototype.getEntryLinks = function (item, itemType, selectable) {
' <span class="hidden-below-800">' +
jsu.translateHTML('Add a video') + '</span></a>';
}
if (isTrashBin) {
html += '<button type="button" title="' + jsu.translateAttribute('Restore everything from the recycle bin. All items will be restored in their respective original channels. If the destination channel for an item doesn\'t exist anymore, the content will be moved to the fallback restoration channel.') + '"' +
'class="' + this.btnClass + ' button main trash-restore-all-media">' +
'<i class="fa fa-refresh" aria-hidden="true"></i>' +
'<span class="hidden-below-800" style="margin-left: 0.3em;">' +
jsu.translateHTML('Restore all') +
'</span>' +
'</button>';
html += '<button type="button" title="' + jsu.translateAttribute('Permanently delete everything in recycle bin') + '"' +
'class="' + this.btnClass + ' button danger trash-delete-all-media">' +
'<i class="fa fa-trash" aria-hidden="true"></i>' +
'<span class="hidden-below-800" style="margin-left: 0.3em;">' +
jsu.translateHTML('Delete all') +
'</span>' +
'</button>';
}
} else {
if (itemType != 'channel' && this.ltiMode) {
html += '<button type="button" class="' + this.btnClass + ' button default item-entry-copy" data-link="' + this.getButtonLink(item, 'lti', true) + '"><i class="fa fa-chain" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Copy LTI link') + '</span></button>';
Expand All @@ -970,8 +1008,18 @@ MSBrowser.prototype.getEntryLinks = function (item, itemType, selectable) {
if (item.can_edit) {
html += '<a class="' + this.btnClass + ' button item-entry-pick-edit-media default" href="' + this.getButtonLink(item, 'edit') + '"' + this.linksTarget + '><i class="fa fa-pencil" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Edit') + '</span></a>';
}
if (item.can_delete) {
html += '<button type="button" class="' + this.btnClass + ' button item-entry-pick-delete-media danger"><i class="fa fa-trash" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Delete') + '</span></button>';
if (itemInTrash) {
if (item.can_delete) {
if (item.trash_data.parent_url) {
html += '<a type="button" class="' + this.btnClass + ' button default" href="' + item.trash_data.parent_url + '" title="' + jsu.translateAttribute('Go to this item\'s original location (before the item was deleted).') + '"><i class="fa fa-arrow-up" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Open original channel') + '</span></a>';
}
html += '<button type="button" class="' + this.btnClass + ' button item-entry-pick-trash-delete-media danger"><i class="fa fa-trash" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Delete definitively') + '</span></button>';
html += '<button type="button" class="' + this.btnClass + ' button item-entry-pick-trash-restore-media main" title="' + jsu.translateAttribute('This item will be restored in its original channel. If the destination channel doesn\'t exist anymore, the item will be moved to the fallback restoration channel.') + '"><i class="fa fa-refresh" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Restore') + '</span></button>';
}
} else {
if (item.can_delete) {
html += '<button type="button" class="' + this.btnClass + ' button item-entry-pick-delete-media danger"><i class="fa fa-trash" aria-hidden="true"></i> <span class="hidden-below-440">' + jsu.translateHTML('Delete') + '</span></button>';
}
}
}
}
Expand Down Expand Up @@ -1003,6 +1051,39 @@ MSBrowser.prototype.getEntryLinks = function (item, itemType, selectable) {
event.data.obj.pick(event.data.item.oid, 'delete');
});
}
if (isTrashBin) {
$('.trash-restore-all-media', $entryLinks).click({ obj: this, item: item }, function (event) {
const allSubItems = [];
console.log(event.data.obj.channels.lastResponse);
for (const itemType of ['channels', 'videos', 'live_streams', 'photos_groups']) {
if (Array.isArray(event.data.obj.channels.lastResponse[itemType])) {
for (const item of event.data.obj.channels.lastResponse[itemType]) {
allSubItems.push(item);
}
}
}
event.data.obj.deleteOrRestore(allSubItems, true);
});
$('.trash-delete-all-media', $entryLinks).click({ obj: this, item: item }, function (event) {
const allSubItems = [];
for (const itemType of ['channels', 'videos', 'live_streams', 'photos_groups']) {
if (Array.isArray(event.data.obj.channels.lastResponse[itemType])) {
for (const item of event.data.obj.channels.lastResponse[itemType]) {
allSubItems.push(item);
}
}
}
event.data.obj.deleteOrRestore(allSubItems);
});
}
if (itemInTrash) {
$('.item-entry-pick-trash-delete-media', $entryLinks).click({ obj: this, item: item }, function (event) {
event.data.obj.deleteOrRestore([event.data.item]);
});
$('.item-entry-pick-trash-restore-media', $entryLinks).click({ obj: this, item: item }, function (event) {
event.data.obj.deleteOrRestore([event.data.item], true);
});
}
const $copyBtn = $('.item-entry-copy', $entryLinks);
if ($copyBtn.length > 0) {
$('.item-entry-copy', $entryLinks).click(function () {
Expand Down
14 changes: 14 additions & 0 deletions src/ms-browser.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,20 @@ MSBrowser.prototype._pick = function (oid, result, action, initialPick) {
}
}
};
MSBrowser.prototype.deleteOrRestore = function (items, restore) {
let confirmMessage = (restore ? jsu.translate('This will restore') :
jsu.translate('This will definitively delete')) + ' ';
if (items.length === 1) {
confirmMessage += '"' + items[0].title + '"';
} else {
confirmMessage += items.length + ' ' + jsu.translate('items');
}
confirmMessage += '. ' + jsu.translate('Are you sure?');
if (!confirm(confirmMessage)) {
return;
}
window.deleteFormManager.deleteOrRestoreItems(items, restore);
};
MSBrowser.prototype.remove = function (oid) {
// remove given oid from display without reloading page
// this do not remove the object in the server
Expand Down

0 comments on commit 807db37

Please sign in to comment.