From 22ccb6df03fba0b39a1ba19cd8cbcf8fc77e873a Mon Sep 17 00:00:00 2001
From: thecalcc <me@kmarkov.io>
Date: Mon, 14 Aug 2023 13:12:25 +0300
Subject: [PATCH] Toolbar refactoring improvements

---
 scripts/api/article.ts                        |  9 ++++++---
 .../authoring-angular-integration.tsx         | 20 +++++++++----------
 scripts/apps/authoring-react/data-layer.ts    |  2 +-
 .../authoring-react/field-adapters/index.tsx  |  4 ++--
 .../utilities/compute-editor3-output.ts       |  6 ++++--
 .../fields/linked-items/index.tsx             |  2 +-
 .../actions/publish-tab.tsx                   |  6 +-----
 7 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/scripts/api/article.ts b/scripts/api/article.ts
index e3f4907485..6ab5125689 100644
--- a/scripts/api/article.ts
+++ b/scripts/api/article.ts
@@ -15,7 +15,7 @@ import {IPublishingDateOptions} from 'core/interactive-article-actions-panel/sub
 import {notify} from 'core/notify/notify';
 import ng from 'core/services/ng';
 import {gettext} from 'core/utils';
-import {flatMap, keys, pick, trim, union} from 'lodash';
+import {flatMap, keys, pick, trim} from 'lodash';
 import {IArticle, IDangerousArticlePatchingOptions, IDesk, IStage, onPublishMiddlewareResult} from 'superdesk-api';
 import {duplicateItems} from './article-duplicate';
 import {fetchItems, fetchItemsToCurrentDesk} from './article-fetch';
@@ -426,7 +426,10 @@ function edit(
 function getItemPatchWithKillOrTakedownTemplate(item: IArticle, action: IArticleAction): Promise<IArticle> {
     const itemForTemplate = {
         template_name: action,
-        item: pick(item, union(keys(CONTENT_FIELDS_DEFAULTS), ['_id', 'versioncreated', 'task'])),
+        item: pick(
+            item,
+            [...(keys(CONTENT_FIELDS_DEFAULTS)), '_id', 'versioncreated', 'task'],
+        ),
     };
 
     return httpRequestJsonLocal({
@@ -436,7 +439,7 @@ function getItemPatchWithKillOrTakedownTemplate(item: IArticle, action: IArticle
     }).then((result: IArticle) => {
         return {
             ...result,
-            ...(action === 'kill' && {operation: 'kill'}),
+            ...(action === 'kill' ? {operation: 'kill'} : {}),
             state: ITEM_STATE.PUBLISHED,
         };
     });
diff --git a/scripts/apps/authoring-react/authoring-angular-integration.tsx b/scripts/apps/authoring-react/authoring-angular-integration.tsx
index e3dc134012..a1cd58f443 100644
--- a/scripts/apps/authoring-react/authoring-angular-integration.tsx
+++ b/scripts/apps/authoring-react/authoring-angular-integration.tsx
@@ -210,7 +210,7 @@ function getInlineToolbarActions(
         priority: 0.1,
         component: () => (
             <Button
-                tooltip={gettext('CORRECT')}
+                tooltip={gettext('Correct')}
                 text={gettext('C')}
                 style="filled"
                 type="primary"
@@ -271,7 +271,7 @@ function getInlineToolbarActions(
                 style="filled"
                 type="primary"
                 onClick={() => {
-                    ng.get('authoringWorkspace').authoringOpen(item._id, 'kill');
+                    ng.get('authoringWorkspace').authoringOpen(item._id, 'takedown');
                 }}
             />
         ),
@@ -283,7 +283,7 @@ function getInlineToolbarActions(
         priority: 0.1,
         component: () => (
             <Button
-                tooltip={gettext('UNPUBLISH')}
+                tooltip={gettext('Unpublish')}
                 text={'UP'}
                 style="filled"
                 type="primary"
@@ -318,7 +318,7 @@ function getInlineToolbarActions(
                                 </Spacer>
                             )}
                         >
-                            Are you sure you want to unpublish item &quot;{getItemLabel(item)}&quot;?
+                            {gettext('Are you sure you want to unpublish item "{{label}}"?', {label: getItemLabel(item)})}
                         </Modal>
                     ));
                 }}
@@ -370,13 +370,11 @@ function getInlineToolbarActions(
                     style="filled"
                     type="primary"
                     onClick={() => {
-                        sdApi.article.get(item._id).then((originalArticle) => {
-                            handleUnsavedChanges()
-                                .then(() => {
-                                    sdApi.article.publishItem(item, {...entity, _etag: originalArticle._etag}, 'kill');
-                                })
-                                .then(() => initiateClosing());
-                        });
+                        handleUnsavedChanges()
+                            .then(() => {
+                                sdApi.article.publishItem(item, {...entity}, 'kill');
+                            })
+                            .then(() => initiateClosing());
                     }}
                 />
             );
diff --git a/scripts/apps/authoring-react/data-layer.ts b/scripts/apps/authoring-react/data-layer.ts
index 22fa81cdb6..1196603aed 100644
--- a/scripts/apps/authoring-react/data-layer.ts
+++ b/scripts/apps/authoring-react/data-layer.ts
@@ -398,7 +398,7 @@ export const getAuthoringStorageIArticleKillOrTakedown = (action: IArticleAction
                 return {
                     saved: {
                         ...updated,
-                        original_creator: saved.original_creator,
+                        ...saved, // updated is missing original_creator property so we get it from the saved article
                     },
                     autosaved: autosaved,
                 };
diff --git a/scripts/apps/authoring-react/field-adapters/index.tsx b/scripts/apps/authoring-react/field-adapters/index.tsx
index e94a418e68..0019e84d5e 100644
--- a/scripts/apps/authoring-react/field-adapters/index.tsx
+++ b/scripts/apps/authoring-react/field-adapters/index.tsx
@@ -147,7 +147,7 @@ export function storeEditor3ValueBase(
     article: IArticle,
     value: any, // IEditor3ValueStorage
     config: IEditor3Config,
-    planeTextInMultiLineMode?: boolean,
+    plainTextInMultiLineMode?: boolean,
 )
 : {article: IArticle; stringValue: string; annotations: Array<any>} {
     const rawContentState = value.rawContentState;
@@ -156,7 +156,7 @@ export function storeEditor3ValueBase(
         rawContentState,
         config,
         article.language,
-        planeTextInMultiLineMode,
+        plainTextInMultiLineMode,
     );
 
     const articleUpdated: IArticle = {
diff --git a/scripts/apps/authoring-react/field-adapters/utilities/compute-editor3-output.ts b/scripts/apps/authoring-react/field-adapters/utilities/compute-editor3-output.ts
index d00c3d9bf2..e25ea1fce0 100644
--- a/scripts/apps/authoring-react/field-adapters/utilities/compute-editor3-output.ts
+++ b/scripts/apps/authoring-react/field-adapters/utilities/compute-editor3-output.ts
@@ -8,7 +8,9 @@ export function computeEditor3Output(
     rawContentState: RawDraftContentState,
     config: IEditor3Config,
     language: string,
-    planeTextInMultiLineMode?: boolean,
+
+    // return multi line text for fields with '\n'
+    plainTextInMultiLineMode?: boolean,
 ): IEditor3Output {
     const contentState: ContentState = createEditorStore(
         {
@@ -21,7 +23,7 @@ export function computeEditor3Output(
     ).getState().editorState.getCurrentContent();
 
     const generatedValue = (() => {
-        if (config.singleLine || planeTextInMultiLineMode) {
+        if (config.singleLine || plainTextInMultiLineMode) {
             return contentState.getPlainText();
         } else {
             return editor3StateToHtml(contentState);
diff --git a/scripts/apps/authoring-react/fields/linked-items/index.tsx b/scripts/apps/authoring-react/fields/linked-items/index.tsx
index 93cc8ca1d2..b2bbb27ac5 100644
--- a/scripts/apps/authoring-react/fields/linked-items/index.tsx
+++ b/scripts/apps/authoring-react/fields/linked-items/index.tsx
@@ -37,7 +37,7 @@ export function getLinkedItemsField(): ILinkedItemsField {
         contributions: {
             authoring: {
                 onCloseAfter: (item) => {
-                    const itemId = item?._id;
+                    const itemId = item._id;
                     const storedItemId = sdApi.localStorage.getItem(`open-item-after-related-closed--${itemId}`);
 
                     /**
diff --git a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx
index 8d3f6e44d7..51c06b5f24 100644
--- a/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx
+++ b/scripts/core/interactive-article-actions-panel/actions/publish-tab.tsx
@@ -102,11 +102,7 @@ export class PublishTab extends React.PureComponent<IProps, IState> {
                         cloneDeep(itemToPublish),
                         'publish',
                         this.props.onError,
-                    )
-                        .then(() => {
-                            ng.get('authoringWorkspace').close();
-                            notify.success('Item published.');
-                        });
+                    );
                 });
             })
             .catch(() => {