Fix logic for shortcut buttons

scripts/api/article.ts

@@ -74,9 +74,7 @@ function canPublish(item: IArticle): boolean {
         return false;
     }
 
-    const $location = ng.get('$location');
-
-    if ($location.path() === '/workspace/personal' && appConfig?.features?.publishFromPersonal !== true) {
+    if (sdApi.navigation.isPersonalSpace() && appConfig?.features?.publishFromPersonal !== true) {
         return false;
     } else {
         const deskId = item?.task?.desk;
@@ -311,9 +309,9 @@ function canPublishOnDesk(deskType: string): boolean {
 
 function showPublishAndContinue(item: IArticle, dirty: boolean): boolean {
     return appConfig.features?.customAuthoringTopbar?.publishAndContinue
-        && sdApi.navigation.isPersonalSpace()
+        && !sdApi.navigation.isPersonalSpace()
         && canPublishOnDesk(sdApi.desks.getDeskById(sdApi.desks.getCurrentDeskId()).desk_type)
-        && authoringApiCommon.checkShortcutButtonAvailability(item, dirty, sdApi.navigation.isPersonalSpace());
+        && authoringApiCommon.checkShortcutButtonAvailability(item, dirty);
 }
 
 function showCloseAndContinue(item: IArticle, dirty: boolean): boolean {

scripts/api/navigation.ts

@@ -20,7 +20,7 @@ function currentPathStartsWith(
 }
 
 function isPersonalSpace(): boolean {
-    return !(ng.get('$location').path() === '/workspace/personal');
+    return ng.get('$location').path() === '/workspace/personal';
 }
 
 export const navigation = {

scripts/apps/archive/controllers/UploadController.ts

@@ -8,6 +8,7 @@ import {IPTCMetadata, IUser, IArticle} from 'superdesk-api';
 import {appConfig} from 'appConfig';
 import {fileUploadErrorModal} from './file-upload-error-modal';
 import {showModal} from '@superdesk/common';
+import {sdApi} from 'api';
 
 const isNotEmptyString = (value: any) => value != null && value !== '';
 
@@ -102,7 +103,7 @@ export function UploadController(
     $scope.allowAudio = !($scope.locals && $scope.locals.data && $scope.locals.data.allowAudio === false);
     $scope.validator = _.omit(appConfig.validator_media_metadata, ['archive_description']);
     $scope.parent = $scope.locals?.data?.parent || null;
-    $scope.deskSelectionAllowed = ($location.path() !== '/workspace/personal') && $scope.locals &&
+    $scope.deskSelectionAllowed = !sdApi.navigation.isPersonalSpace() && $scope.locals &&
         $scope.locals.data && $scope.locals.data.deskSelectionAllowed === true;
 
     if ($scope.deskSelectionAllowed === true) {

scripts/apps/archive/index.tsx

@@ -468,7 +468,7 @@ function spikeActivity(data, modal, $location, multi,
     });
 
     function _spike() {
-        if ($location.path() === '/workspace/personal') {
+        if (sdApi.navigation.isPersonalSpace()) {
             return modal.confirm(gettext('Do you want to delete the item permanently?'), gettext('Confirm'))
                 .then(() => sdApi.article.doSpike(data.item));
         }

scripts/apps/archive/services/ArchiveService.ts

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 import moment from 'moment';
 import {appConfig} from 'appConfig';
+import {sdApi} from 'api';
 
 ArchiveService.$inject = ['desks', 'session', 'api', '$q', 'search', '$location'];
 export function ArchiveService(desks, session, api, $q, search, $location) {
@@ -11,7 +12,7 @@ export function ArchiveService(desks, session, api, $q, search, $location) {
      * @param {Object} desk when passed the item will be assigned to this desk instead of user's activeDesk.
      */
     this.addTaskToArticle = function(item, desk = desks.getCurrentDesk()) {
-        if ((!item.task || !item.task.desk) && desk && $location.path() !== '/workspace/personal') {
+        if ((!item.task || !item.task.desk) && desk && !sdApi.navigation.isPersonalSpace()) {
             item.task = {desk: desk._id, stage: desk.working_stage, user: session.identity._id};
         }
     };

scripts/apps/authoring/authoring/services/AuthoringService.ts

@@ -13,6 +13,7 @@ import {appConfig, extensions} from 'appConfig';
 import {IPublishedArticle, IArticle, IExtensionActivationResult} from 'superdesk-api';
 import {getPublishWarningConfirmModal} from '../components/publish-warning-confirm-modal';
 import {authoringApiCommon} from 'apps/authoring-bridge/authoring-api-common';
+import {sdApi} from 'api';
 
 function isReadOnly(item: IArticle) {
     return READONLY_STATES.includes(item.state);
@@ -377,7 +378,7 @@ export function AuthoringService(
     ) {
         let extDiff = helpers.extendItem({}, diff);
 
-        if (extDiff['task'] && $location.path() !== '/workspace/personal') {
+        if (extDiff['task'] && !sdApi.navigation.isPersonalSpace()) {
             delete extDiff['task'];
         }
 
@@ -815,7 +816,7 @@ export function AuthoringService(
     this._updateGeneralActions = function(currentItem, action) {
         let isReadOnlyState = this._isReadOnly(currentItem);
         let userPrivileges = privileges.privileges;
-        let isPersonalSpace = $location.path() === '/workspace/personal';
+        const isPersonalSpace = sdApi.navigation.isPersonalSpace();
 
         action.re_write = canRewrite(currentItem) === true && !isBeingCorrected(currentItem)
             && !isCorrection(currentItem);

scripts/apps/search/controllers/get-multi-actions.tsx

@@ -163,7 +163,7 @@ export function getMultiActions(
             });
         };
 
-        if ($location.path() === '/workspace/personal') {
+        if (sdApi.navigation.isPersonalSpace()) {
             modal.confirm(gettext('Do you want to delete the items permanently?')).then(spikeMultiple);
             return;
         }

scripts/core/ui/components/content-create-dropdown/initial-view.tsx

@@ -194,7 +194,7 @@ export class InitialView extends React.PureComponent<IProps, IState> {
 
                                 <div>
                                     {
-                                        sdApi.navigation.getPath() !== '/workspace/personal' && (
+                                        !sdApi.navigation.isPersonalSpace() && (
                                             <DropdownOption
                                                 label={gettext('Create package')}
                                                 icon={{name: 'package-plus'}}