diff --git a/client/components/settings/adminReports.jade b/client/components/settings/adminReports.jade index fded9505a..452d2e1b9 100644 --- a/client/components/settings/adminReports.jade +++ b/client/components/settings/adminReports.jade @@ -11,11 +11,6 @@ template(name="adminReports") i.fa.fa-chain-broken | {{_ 'broken-cards'}} - li - a.js-report-files(data-id="report-orphaned-files") - i.fa.fa-paperclip - | {{_ 'orphanedFilesReportTitle'}} - li a.js-report-files(data-id="report-files") i.fa.fa-paperclip @@ -43,8 +38,6 @@ template(name="adminReports") +brokenCardsReport else if showFilesReport.get +filesReport - else if showOrphanedFilesReport.get - +orphanedFilesReport else if showRulesReport.get +rulesReport else if showBoardsReport.get @@ -99,27 +92,6 @@ template(name="filesReport") else div {{_ 'no-results' }} -template(name="orphanedFilesReport") - h1 {{_ 'orphanedFilesReportTitle'}} - if resultsCount - table.table - tr - th Filename - th.right Size (kB) - th MIME Type - th MD5 Sum - th ID - - each att in results - tr - td {{ att.filename }} - td.right {{fileSize att.length }} - td {{ att.contentType }} - td {{ att.md5 }} - td {{ att._id.toHexString }} - else - div {{_ 'no-results' }} - template(name="cardsReport") h1 {{_ 'cardsReportTitle'}} if resultsCount diff --git a/client/components/settings/adminReports.js b/client/components/settings/adminReports.js index ebeca8dae..c1c58692a 100644 --- a/client/components/settings/adminReports.js +++ b/client/components/settings/adminReports.js @@ -25,7 +25,6 @@ BlazeComponent.extendComponent({ { 'click a.js-report-broken': this.switchMenu, 'click a.js-report-files': this.switchMenu, - 'click a.js-report-orphaned-files': this.switchMenu, 'click a.js-report-rules': this.switchMenu, 'click a.js-report-cards': this.switchMenu, 'click a.js-report-boards': this.switchMenu, @@ -65,11 +64,6 @@ BlazeComponent.extendComponent({ this.subscription = Meteor.subscribe('attachmentsList', () => { this.loading.set(false); }); - } else if ('report-orphaned-files' === targetID) { - this.showOrphanedFilesReport.set(true); - this.subscription = Meteor.subscribe('orphanedAttachments', () => { - this.loading.set(false); - }); } else if ('report-rules' === targetID) { this.subscription = Meteor.subscribe('rulesReport', () => { this.showRulesReport.set(true); @@ -134,10 +128,6 @@ class AdminReport extends BlazeComponent { collection = Attachments; }.register('filesReport')); -(class extends AdminReport { - collection = AttachmentStorage; -}.register('orphanedFilesReport')); - (class extends AdminReport { collection = Rules; diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json index cfdf89a5a..639667f6e 100644 --- a/i18n/en.i18n.json +++ b/i18n/en.i18n.json @@ -1086,7 +1086,6 @@ "custom-field-stringtemplate-item-placeholder": "Press enter to add more items", "creator": "Creator", "filesReportTitle": "Files Report", - "orphanedFilesReportTitle": "Orphaned Files Report", "reports": "Reports", "rulesReportTitle": "Rules Report", "boardsReportTitle": "Boards Report", diff --git a/server/publications/attachments.js b/server/publications/attachments.js index 33d4d53e2..fe89cd3c8 100644 --- a/server/publications/attachments.js +++ b/server/publications/attachments.js @@ -20,35 +20,3 @@ Meteor.publish('attachmentsList', function() { ).cursor; return ret; }); - -Meteor.publish('orphanedAttachments', function() { - let keys = []; - - if (Attachments.find({}, { fields: { copies: 1 } }) !== undefined) { - Attachments.find({}, { fields: { copies: 1 } }).forEach(att => { - keys.push(new ObjectID(att.copies.attachments.key)); - }); - keys.sort(); - keys = _.uniq(keys, true); - - return AttachmentStorage.find( - { _id: { $nin: keys } }, - { - fields: { - _id: 1, - filename: 1, - md5: 1, - length: 1, - contentType: 1, - metadata: 1, - }, - sort: { - filename: 1, - }, - limit: 250, - }, - ); - } else { - return []; - } -});