From 64319a7090a6b036d2306d5dc210a89d10c5fe3b Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 4 Sep 2018 09:13:32 +0100 Subject: [PATCH] [ACA-1751] fix move/delete commands for shared preview (#598) --- src/app/extensions/core.extensions.module.ts | 3 ++- src/app/extensions/evaluators/app.evaluators.ts | 12 ++++++++++-- .../extensions/evaluators/navigation.evaluators.ts | 8 ++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/app/extensions/core.extensions.module.ts b/src/app/extensions/core.extensions.module.ts index da2648e87..f91799135 100644 --- a/src/app/extensions/core.extensions.module.ts +++ b/src/app/extensions/core.extensions.module.ts @@ -113,7 +113,8 @@ export class CoreExtensionsModule { 'app.navigation.isRecentFiles': nav.isRecentFiles, 'app.navigation.isNotRecentFiles': nav.isNotRecentFiles, 'app.navigation.isSearchResults': nav.isSearchResults, - 'app.navigation.isNotSearchResults': nav.isNotSearchResults + 'app.navigation.isNotSearchResults': nav.isNotSearchResults, + 'app.navigation.isPreview': nav.isPreview }); } } diff --git a/src/app/extensions/evaluators/app.evaluators.ts b/src/app/extensions/evaluators/app.evaluators.ts index 5dda70204..13c2a57ba 100644 --- a/src/app/extensions/evaluators/app.evaluators.ts +++ b/src/app/extensions/evaluators/app.evaluators.ts @@ -32,7 +32,8 @@ import { isLibraries, isTrashcan, isSharedFiles, - isNotSearchResults + isNotSearchResults, + isPreview } from './navigation.evaluators'; export function canAddFavorite( @@ -94,12 +95,19 @@ export function canDeleteSelection( return true; } + if (isPreview(context, ...args)) { + return context.permissions.check(context.selection.nodes, [ + 'delete' + ]); + } + // workaround for Shared Files if (isSharedFiles(context, ...args)) { return context.permissions.check( context.selection.nodes, ['delete'], - { target: 'allowableOperationsOnTarget' }); + { target: 'allowableOperationsOnTarget' } + ); } return context.permissions.check(context.selection.nodes, ['delete']); diff --git a/src/app/extensions/evaluators/navigation.evaluators.ts b/src/app/extensions/evaluators/navigation.evaluators.ts index e7e8be70b..9abd86bfe 100644 --- a/src/app/extensions/evaluators/navigation.evaluators.ts +++ b/src/app/extensions/evaluators/navigation.evaluators.ts @@ -114,3 +114,11 @@ export function isNotSearchResults( ): boolean { return !isSearchResults(context, ...args); } + +export function isPreview( + context: RuleContext, + ...args: RuleParameter[] +): boolean { + const { url } = context.navigation; + return url && url.includes('/preview/'); +}