From 9fa505f6da153431b32b6515bbbdbd0ac142dc13 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Thu, 10 Oct 2024 15:25:55 +0300
Subject: [PATCH 01/14] Pass article through translate endpoint on create
 article  (#4654)

---
 scripts/api/article.ts                        | 18 ++++++++++
 .../services/TranslationService.ts            | 26 +++++---------
 .../core/get-superdesk-api-implementation.tsx |  2 ++
 scripts/core/superdesk-api.d.ts               |  2 ++
 .../src/translations/translations-body.tsx    | 35 ++++++++-----------
 5 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/scripts/api/article.ts b/scripts/api/article.ts
index 0c32436c18..ec468559d3 100644
--- a/scripts/api/article.ts
+++ b/scripts/api/article.ts
@@ -21,6 +21,7 @@ import {
     IAuthoringActionType,
     IDangerousArticlePatchingOptions,
     IDesk,
+    IExtensionActivationResult,
     IStage,
     onPublishMiddlewareResult,
 } from 'superdesk-api';
@@ -231,6 +232,21 @@ function createNewWithData(data: Partial<IArticle>, contentProfileId: string): v
         });
 }
 
+function translate(
+    item: IArticle,
+    language: string,
+): Promise<IArticle> {
+    return httpRequestJsonLocal<IArticle>({
+        method: 'POST',
+        path: '/archive/translate',
+        payload: {
+            guid: item.guid,
+            language: language,
+            desk: sdApi.desks.getCurrentDeskId(),
+        },
+    });
+}
+
 /**
  * Checks if associations is with rewrite_of item then open then modal to add associations.
  * The user has options to add associated media to the current item and review the media change
@@ -514,6 +530,7 @@ function rewrite(item: IArticle): void {
 }
 
 interface IArticleApi {
+    translate(item: IArticle, language: string): Promise<IArticle>;
     get(id: IArticle['_id']): Promise<IArticle>;
     isLocked(article: IArticle): boolean;
     isEditable(article: IArticle): boolean;
@@ -608,6 +625,7 @@ interface IArticleApi {
 }
 
 export const article: IArticleApi = {
+    translate,
     rewrite,
     isLocked,
     isEditable,
diff --git a/scripts/apps/translations/services/TranslationService.ts b/scripts/apps/translations/services/TranslationService.ts
index 282f294049..a83b28358f 100644
--- a/scripts/apps/translations/services/TranslationService.ts
+++ b/scripts/apps/translations/services/TranslationService.ts
@@ -1,9 +1,9 @@
 import _, {flatMap} from 'lodash';
-import {AuthoringWorkspaceService} from 'apps/authoring/authoring/services/AuthoringWorkspaceService';
-import {gettext} from 'core/utils';
 import {extensions} from 'appConfig';
-import {IExtensionActivationResult} from 'superdesk-api';
-import ng from 'core/services/ng';
+import {IArticle, IExtensionActivationResult} from 'superdesk-api';
+import {sdApi} from 'api';
+import {ILanguage} from 'superdesk-interfaces/Language';
+import {openArticle} from 'core/get-superdesk-api-implementation';
 
 /**
  * @ngdoc service
@@ -18,13 +18,10 @@ import ng from 'core/services/ng';
  * @description Provides set of methods to translate items to different languages
  */
 
-TranslationService.$inject = ['api', '$rootScope', 'notify', 'authoringWorkspace', 'desks', 'search'];
+TranslationService.$inject = ['api', '$rootScope', 'search'];
 export function TranslationService(
     api,
     $rootScope,
-    notify,
-    authoringWorkspace: AuthoringWorkspaceService,
-    desks,
     search,
 ) {
     var service: any = {};
@@ -59,14 +56,8 @@ export function TranslationService(
      * @param {Object} item item to be translated
      * @param {Object} language translate language
      */
-    service.set = function(item, language) {
-        var params = {
-            guid: item.guid,
-            language: language.language,
-            desk: desks.getCurrentDeskId(),
-        };
-
-        api.save('translate', params).then((_item) => {
+    service.set = function(item: IArticle, language: ILanguage) {
+        sdApi.article.translate(item, language.language).then((_item) => {
             const onTranslateAfterMiddlewares
                     : Array<IExtensionActivationResult['contributions']['entities']['article']['onTranslateAfter']>
                 = flatMap(
@@ -79,8 +70,7 @@ export function TranslationService(
                     fn(item, _item);
                 });
             } else {
-                ng.get('authoringWorkspace').open(_item);
-                notify.success(gettext('Item Translated'));
+                return openArticle(_item._id, 'edit');
             }
 
             $rootScope.$broadcast('item:translate');
diff --git a/scripts/core/get-superdesk-api-implementation.tsx b/scripts/core/get-superdesk-api-implementation.tsx
index ec75915de0..786d2d9642 100644
--- a/scripts/core/get-superdesk-api-implementation.tsx
+++ b/scripts/core/get-superdesk-api-implementation.tsx
@@ -325,6 +325,8 @@ export function getSuperdeskApiImplementation(
         getExtensionConfig: () => extensions[requestingExtensionId]?.configuration ?? {},
         entities: {
             article: {
+                translate: sdApi.article.translate,
+                get: sdApi.article.get,
                 isPersonal: sdApi.article.isPersonal,
                 isLocked: sdApi.article.isLocked,
                 isLockedInCurrentSession: sdApi.article.isLockedInCurrentSession,
diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts
index 90580e924b..75b3781ab7 100644
--- a/scripts/core/superdesk-api.d.ts
+++ b/scripts/core/superdesk-api.d.ts
@@ -2883,6 +2883,8 @@ declare module 'superdesk-api' {
         };
         entities: {
             article: {
+                translate(article: IArticle, language: string): Promise<IArticle>;
+                get(articleId: IArticle['_id']): Promise<IArticle>;
                 isLocked(article: IArticle): boolean; // returns true if locked by anyone, including the current user
                 isLockedInCurrentSession(article: IArticle): boolean;
                 isLockedInOtherSession(article: IArticle): boolean;
diff --git a/scripts/extensions/ai-widget/src/translations/translations-body.tsx b/scripts/extensions/ai-widget/src/translations/translations-body.tsx
index d0c073ae7c..cefc089213 100644
--- a/scripts/extensions/ai-widget/src/translations/translations-body.tsx
+++ b/scripts/extensions/ai-widget/src/translations/translations-body.tsx
@@ -124,26 +124,21 @@ export default class TranslationsBody extends React.Component<IProps, IState> {
                     {this.props.mode === 'current' && (
                         <Button
                             onClick={() => {
-                                const currentDeskId = superdesk.entities.desk.getActiveDeskId();
-                                const taskData = (() => {
-                                    if (currentDeskId != null) {
-                                        const currentDesk = superdesk.entities.desk.getDeskById(currentDeskId);
+                                const {article: articleApi} = superdesk.entities;
 
-                                        return {
-                                            user: article.task.user,
-                                            desk: currentDesk._id,
-                                            stage: currentDesk.working_stage,
-                                        };
-                                    }
-
-                                    return {user: article.task.user};
-                                })();
-
-                                superdesk.entities.article.createNewWithData({
-                                    body_html: translation,
-                                    task: taskData,
-                                    language: this.props.activeLanguageId,
-                                }, article.profile);
+                                articleApi.translate(
+                                    article,
+                                    this.props.activeLanguageId,
+                                ).then((translatedItem) =>
+                                    articleApi.get(translatedItem._id).then((fullTranslatedItem) => {
+                                        return articleApi.patch(
+                                            fullTranslatedItem,
+                                            {body_html: translation, fields_meta: {}},
+                                        ).then(() => {
+                                            superdesk.ui.article.edit(fullTranslatedItem._id);
+                                        });
+                                    }),
+                                );
                             }}
                             size="small"
                             text={gettext('Create article')}
@@ -160,7 +155,7 @@ export default class TranslationsBody extends React.Component<IProps, IState> {
                                         'body_html',
                                         superdesk.helpers.editor3ToOperationalFormat(
                                             {rawContentState: rawState},
-                                            this.props.article.language,
+                                            article.language,
                                         ),
                                     ));
                             } else {

From 89030e34452437771b43873cfae84a8353edaedb Mon Sep 17 00:00:00 2001
From: Tomas Kikutis <t.kikutis@gmail.com>
Date: Thu, 10 Oct 2024 19:33:12 +0200
Subject: [PATCH 02/14] add search to elastic endpoints list (#4658)

---
 scripts/core/helpers/universal-query.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/core/helpers/universal-query.ts b/scripts/core/helpers/universal-query.ts
index 3ffe40c977..95ba1b6986 100644
--- a/scripts/core/helpers/universal-query.ts
+++ b/scripts/core/helpers/universal-query.ts
@@ -3,6 +3,7 @@ import {IHttpRequestOptionsLocal, ISuperdeskQuery} from 'superdesk-api';
 
 const elasticEndpoints = [
     '/archive',
+    '/search',
     '/rundowns',
     '/rundown_items',
     '/events',

From 7030b6fac707ef583d5b67e916897863afd25b6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= <jasekpetr@gmail.com>
Date: Mon, 21 Oct 2024 07:39:11 +0200
Subject: [PATCH 03/14] make SelectUser dynamic again (#4669)

uses new api for desk members

SDBELGA-894
---
 scripts/core/ui/components/SelectUser.tsx | 46 +++++++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/scripts/core/ui/components/SelectUser.tsx b/scripts/core/ui/components/SelectUser.tsx
index d76527ad07..1f1ab00ad8 100644
--- a/scripts/core/ui/components/SelectUser.tsx
+++ b/scripts/core/ui/components/SelectUser.tsx
@@ -1,11 +1,11 @@
 /* eslint-disable react/no-multi-comp */
 import React from 'react';
-import {IPropsSelectUser, IUser} from 'superdesk-api';
-import {gettext, searchUsers} from 'core/utils';
+import {IPropsSelectUser, IUser, IRestApiResponse} from 'superdesk-api';
+import {gettext, getUserSearchMongoQuery} from 'core/utils';
 import {UserAvatar} from 'apps/users/components/UserAvatar';
 import {SelectWithTemplate, Spacer} from 'superdesk-ui-framework/react';
+import {httpRequestJsonLocal} from 'core/helpers/network';
 import {SuperdeskReactComponent} from 'core/SuperdeskReactComponent';
-import {sdApi} from 'api';
 
 interface IState {
     selectedUser: IUser | null | 'loading';
@@ -117,11 +117,41 @@ export class SelectUser extends SuperdeskReactComponent<IPropsSelectUser, IState
                 inlineLabel={true}
                 labelHidden={true}
                 getItems={(searchString) => {
-                    const users = this.props.deskId
-                        ? sdApi.desks.getDeskMembers(this.props.deskId)
-                        : sdApi.user.getAll().toArray();
-
-                    return Promise.resolve(searchUsers(users, searchString));
+                    this.abortController?.abort();
+                    this.abortController = new AbortController();
+
+                    let url = '/users';
+
+                    if (this.props.deskId != null && this.props.deskId != '') {
+                        url = `/desks/${this.props.deskId}/users`;
+                    }
+
+                    const urlParams = {max_results: 50};
+
+                    if (searchString != null && searchString.length > 0) {
+                        urlParams['where'] = getUserSearchMongoQuery(searchString);
+                    }
+
+                    // Wrapping into additional promise in order to avoid having to handle rejected promise
+                    // in `SelectWithTemplate` component. The component takes a generic promise
+                    // as an argument and not a fetch result so it wouldn't be good to handle
+                    // fetch-specific rejections there.
+                    return new Promise((resolve) => {
+                        httpRequestJsonLocal<IRestApiResponse<IUser>>({
+                            method: 'GET',
+                            path: url,
+                            urlParams,
+                            abortSignal: this.abortController.signal,
+                        }).then((res) => {
+                            resolve(res._items);
+                        }).catch((err) => {
+                            // If user types something in the filter input all unfinished requests will be aborted.
+                            // This is expected behaviour here and should not throw an error.
+                            if (err?.name !== 'AbortError') {
+                                throw err;
+                            }
+                        });
+                    });
                 }}
                 value={this.state.selectedUser}
                 onChange={(user) => {

From 910068ec6fe540633125b669ac5fc85b861c26a8 Mon Sep 17 00:00:00 2001
From: Tomas Kikutis <t.kikutis@gmail.com>
Date: Mon, 21 Oct 2024 14:13:58 +0200
Subject: [PATCH 04/14] avoid type issues

---
 scripts/extensions/ai-widget/src/superdesk.ts           | 2 +-
 scripts/extensions/auto-tagging-widget/src/superdesk.ts | 2 +-
 scripts/extensions/booleanField/src/superdesk.ts        | 2 +-
 scripts/extensions/broadcasting/src/superdesk.ts        | 2 +-
 scripts/extensions/datetimeField/src/superdesk.ts       | 2 +-
 scripts/extensions/helloWorld/src/superdesk.ts          | 2 +-
 scripts/extensions/predefinedTextField/src/superdesk.ts | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/extensions/ai-widget/src/superdesk.ts b/scripts/extensions/ai-widget/src/superdesk.ts
index 6c18daf514..d2e323fdf9 100644
--- a/scripts/extensions/ai-widget/src/superdesk.ts
+++ b/scripts/extensions/ai-widget/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['ai-widget'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['ai-widget'] as ISuperdesk;
diff --git a/scripts/extensions/auto-tagging-widget/src/superdesk.ts b/scripts/extensions/auto-tagging-widget/src/superdesk.ts
index 995ed82ed9..864c13e0fa 100644
--- a/scripts/extensions/auto-tagging-widget/src/superdesk.ts
+++ b/scripts/extensions/auto-tagging-widget/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['auto-tagging-widget'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['auto-tagging-widget'] as ISuperdesk;
diff --git a/scripts/extensions/booleanField/src/superdesk.ts b/scripts/extensions/booleanField/src/superdesk.ts
index 2f82dfad8f..f2af0fd652 100644
--- a/scripts/extensions/booleanField/src/superdesk.ts
+++ b/scripts/extensions/booleanField/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['booleanField'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['booleanField'] as ISuperdesk;
diff --git a/scripts/extensions/broadcasting/src/superdesk.ts b/scripts/extensions/broadcasting/src/superdesk.ts
index c5892a5991..940951cbf4 100644
--- a/scripts/extensions/broadcasting/src/superdesk.ts
+++ b/scripts/extensions/broadcasting/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['broadcasting'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['broadcasting'] as ISuperdesk;
diff --git a/scripts/extensions/datetimeField/src/superdesk.ts b/scripts/extensions/datetimeField/src/superdesk.ts
index cb4e5ec66b..a74b9634ad 100644
--- a/scripts/extensions/datetimeField/src/superdesk.ts
+++ b/scripts/extensions/datetimeField/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['datetimeField'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['datetimeField'] as ISuperdesk;
diff --git a/scripts/extensions/helloWorld/src/superdesk.ts b/scripts/extensions/helloWorld/src/superdesk.ts
index 1cc89105e1..e29082b291 100644
--- a/scripts/extensions/helloWorld/src/superdesk.ts
+++ b/scripts/extensions/helloWorld/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['helloWorld'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['helloWorld'] as ISuperdesk;
diff --git a/scripts/extensions/predefinedTextField/src/superdesk.ts b/scripts/extensions/predefinedTextField/src/superdesk.ts
index 9436dcd41e..528b64255b 100644
--- a/scripts/extensions/predefinedTextField/src/superdesk.ts
+++ b/scripts/extensions/predefinedTextField/src/superdesk.ts
@@ -2,4 +2,4 @@ import {ISuperdesk} from 'superdesk-api';
 
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-export const superdesk = window['extensionsApiInstances']['predefinedTextField'] as ISuperdesk;
+export const superdesk: ISuperdesk = window['extensionsApiInstances']['predefinedTextField'] as ISuperdesk;

From c9ae32d4d04a0f682064157770d34aa73d321390 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Tue, 22 Oct 2024 10:57:11 +0300
Subject: [PATCH 05/14] Fix AI widget copy translation (#4668) (#4670)

* Fix AI widget copy translation

* Fix lint
---
 .../ai-widget/src/translations/translations-body.tsx        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/extensions/ai-widget/src/translations/translations-body.tsx b/scripts/extensions/ai-widget/src/translations/translations-body.tsx
index cefc089213..dda068534f 100644
--- a/scripts/extensions/ai-widget/src/translations/translations-body.tsx
+++ b/scripts/extensions/ai-widget/src/translations/translations-body.tsx
@@ -118,7 +118,11 @@ export default class TranslationsBody extends React.Component<IProps, IState> {
                         ariaValue={gettext('Copy')}
                         icon="copy"
                         onClick={() => {
-                            navigator.clipboard.writeText(translation);
+                            const clipboardItem = new ClipboardItem(
+                                {'text/html': new Blob([translation], {type: 'text/html'})},
+                            );
+
+                            navigator.clipboard.write([clipboardItem]);
                         }}
                     />
                     {this.props.mode === 'current' && (

From e74c71dcc0609321cff08c3ccf9f268f926b1b80 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Tue, 22 Oct 2024 12:31:06 +0300
Subject: [PATCH 06/14] Apply middleware changes on autosave and push them to
 the editor, unify common calls (#4671)

---
 .../directives/AuthoringDirective.ts          |  3 +-
 .../authoring/services/AutosaveService.ts     | 37 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts
index 08fb416865..07f25f4eff 100644
--- a/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts
+++ b/scripts/apps/authoring/authoring/directives/AuthoringDirective.ts
@@ -843,7 +843,7 @@ export function AuthoringDirective(
                     }
                 });
 
-                $scope.autosave(item);
+                $scope.autosave(item, 0);
             };
 
             $scope.firstLineConfig = appConfig?.ui?.authoring?.firstLine ?? {};
@@ -858,6 +858,7 @@ export function AuthoringDirective(
                     $scope.item,
                     $scope.origItem,
                     timeout,
+                    $scope.$applyAsync,
                 ).then(
                     () => {
                         $scope.$applyAsync(() => {
diff --git a/scripts/apps/authoring/authoring/services/AutosaveService.ts b/scripts/apps/authoring/authoring/services/AutosaveService.ts
index 7a35fcd65e..8576438aa5 100644
--- a/scripts/apps/authoring/authoring/services/AutosaveService.ts
+++ b/scripts/apps/authoring/authoring/services/AutosaveService.ts
@@ -1,7 +1,7 @@
 import * as helpers from 'apps/authoring/authoring/helpers';
 import {AUTOSAVE_TIMEOUT} from 'core/constants';
 import {IArticle} from 'superdesk-api';
-import {runBeforeUpdateMiddlware, runAfterUpdateEvent} from './authoring-helpers';
+import {authoringApiCommon} from 'apps/authoring-bridge/authoring-api-common';
 
 const RESOURCE = 'archive_autosave';
 
@@ -60,33 +60,44 @@ export class AutosaveService {
     /**
      * Auto-saves an item
      */
-    save(item: IArticle, orig: IArticle, timeout: number = AUTOSAVE_TIMEOUT, callback) {
+    save(
+        item: IArticle,
+        orig: IArticle,
+        timeout: number = AUTOSAVE_TIMEOUT,
+        callback, applyAsync?: () => Promise<void>,
+    ) {
         if (!item._editable || !item._locked) {
             return $q.reject('item not ' + item._editable ? 'locked' : 'editable');
         }
 
         this.stop(item);
 
-        let id = item._id;
+        const id = item._id;
 
         this.timeouts[id] = $timeout(() => {
-            runBeforeUpdateMiddlware(item, orig)
+            authoringApiCommon.saveBefore(item, orig)
                 .then((itemLatest: IArticle) => {
-                    var diff = helpers.extendItem({_id: id}, itemLatest);
+                    const diff = helpers.extendItem({_id: id}, itemLatest);
 
                     helpers.filterDefaultValues(diff, orig);
+                    helpers.extendItem(item, diff); // update item for changes to get picked up by the editor
 
-                    return api.save(RESOURCE, {}, diff).then((_autosave: IArticle) => {
-                        runAfterUpdateEvent(orig, _autosave);
+                    const saveAndRunMiddleware = () => {
+                        return api.save(RESOURCE, {}, diff).then((_autosave: IArticle) => {
+                            authoringApiCommon.saveAfter(item, orig);
+                            orig._autosave = _autosave;
+                            callback?.();
 
-                        orig._autosave = _autosave;
+                            return _autosave;
+                        });
+                    };
 
-                        if (typeof callback === 'function') {
-                            callback();
-                        }
+                    if (applyAsync) {
+                        // update authoring view
+                        return applyAsync().then(() => saveAndRunMiddleware());
+                    }
 
-                        return _autosave;
-                    });
+                    return saveAndRunMiddleware();
                 });
         }, timeout, false);
 

From aa9579c398a0cadd3ba1307a09f643d264ffced7 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Thu, 31 Oct 2024 13:19:31 +0200
Subject: [PATCH 07/14] Add UI feedback (#4679)

---
 .../directives/HighlightsReactDropdown.tsx    |  1 +
 .../highlights/services/HighlightsService.ts  | 24 ++++++++++++----
 scripts/apps/search/components/Item.tsx       | 10 +++++++
 .../search/components/ItemListTemplate.tsx    |  2 ++
 .../apps/search/components/ListItemInfo.tsx   |  3 ++
 scripts/core/helpers/network.tsx              | 28 +++++++++++++++++++
 6 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/scripts/apps/highlights/directives/HighlightsReactDropdown.tsx b/scripts/apps/highlights/directives/HighlightsReactDropdown.tsx
index 87123a26af..652b3b4fc9 100644
--- a/scripts/apps/highlights/directives/HighlightsReactDropdown.tsx
+++ b/scripts/apps/highlights/directives/HighlightsReactDropdown.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import HighlightBtn from '../components/HighlightBtn';
+import {Loader, Spinner} from 'superdesk-ui-framework/react';
 
 /**
  * @ngdoc directive
diff --git a/scripts/apps/highlights/services/HighlightsService.ts b/scripts/apps/highlights/services/HighlightsService.ts
index ca00cb5833..f16e2d352e 100644
--- a/scripts/apps/highlights/services/HighlightsService.ts
+++ b/scripts/apps/highlights/services/HighlightsService.ts
@@ -2,6 +2,8 @@ import _ from 'lodash';
 import {gettext} from 'core/utils';
 import {IPackagesService} from 'types/Services/Packages';
 import {IBaseRestApiResponse} from 'superdesk-api';
+import {notify} from 'core/notify/notify';
+import {trackArticleActionProgress} from 'core/helpers/network';
 
 export interface IHighlight extends IBaseRestApiResponse {
     name: string;
@@ -54,11 +56,13 @@ export function HighlightsService(api, $q, $cacheFactory, packages: IPackagesSer
         var criteria = {};
 
         if (desk) {
-            criteria = {where: {$or: [
-                {desks: desk},
-                {desks: {$size: 0}},
-            ],
-            },
+            criteria = {
+                where: {
+                    $or: [
+                        {desks: desk},
+                        {desks: {$size: 0}},
+                    ],
+                },
             };
         }
 
@@ -111,7 +115,15 @@ export function HighlightsService(api, $q, $cacheFactory, packages: IPackagesSer
      * Mark an item for a highlight
      */
     service.markItem = function(highlight, markedItem) {
-        return api.save('marked_for_highlights', {highlights: [highlight], marked_item: markedItem._id});
+        return trackArticleActionProgress(
+            () => api.save(
+                'marked_for_highlights',
+                {highlights: [highlight], marked_item: markedItem._id},
+            ),
+            markedItem._id,
+            gettext('Item marked'),
+            gettext('Couldn\'t mark item'),
+        );
     };
 
     /**
diff --git a/scripts/apps/search/components/Item.tsx b/scripts/apps/search/components/Item.tsx
index 0ca036c559..bbf52262e3 100644
--- a/scripts/apps/search/components/Item.tsx
+++ b/scripts/apps/search/components/Item.tsx
@@ -111,6 +111,7 @@ export class Item extends React.Component<IProps, IState> {
         this.onDragStart = this.onDragStart.bind(this);
         this.openAuthoringView = this.openAuthoringView.bind(this);
         this.toggleNested = this.toggleNested.bind(this);
+        this.handleActionLoading = this.handleActionLoading.bind(this);
     }
 
     componentWillMount() {
@@ -119,13 +120,21 @@ export class Item extends React.Component<IProps, IState> {
         }
     }
 
+    handleActionLoading(e: CustomEvent) {
+        if (e.detail.itemId === this.props.item._id) {
+            this.setState({loading: e.detail.loading});
+        }
+    }
+
     componentDidMount() {
+        addEventListener('article-action-loading', this.handleActionLoading);
         this._mounted = true;
     }
 
     componentWillUnmount() {
         this._mounted = false;
         closeActionsMenu(this.props.item._id);
+        removeEventListener('article-action-loading', this.handleActionLoading);
     }
 
     componentWillReceiveProps(nextProps) {
@@ -358,6 +367,7 @@ export class Item extends React.Component<IProps, IState> {
             default:
                 return (
                     <ListItemTemplate
+                        loading={this.state.loading}
                         item={item}
                         relatedEntities={this.props.relatedEntities}
                         itemSelected={itemSelected}
diff --git a/scripts/apps/search/components/ItemListTemplate.tsx b/scripts/apps/search/components/ItemListTemplate.tsx
index d2b3c002a4..447d782a01 100644
--- a/scripts/apps/search/components/ItemListTemplate.tsx
+++ b/scripts/apps/search/components/ItemListTemplate.tsx
@@ -9,6 +9,7 @@ interface IPropsItemsListTemplate extends IPropsItemListInfo {
     selectingDisabled: boolean;
     getActionsMenu: () => any;
     multiSelect: IMultiSelectNew | ILegacyMultiSelect;
+    loading?: boolean;
 }
 
 export class ListItemTemplate extends React.Component<IPropsItemsListTemplate> {
@@ -29,6 +30,7 @@ export class ListItemTemplate extends React.Component<IPropsItemsListTemplate> {
                         : null
                 }
                 <ListItemInfo
+                    loading={this.props.loading}
                     item={item}
                     relatedEntities={this.props.relatedEntities}
                     openAuthoringView={this.props.openAuthoringView}
diff --git a/scripts/apps/search/components/ListItemInfo.tsx b/scripts/apps/search/components/ListItemInfo.tsx
index 96195c0243..a8599928ff 100644
--- a/scripts/apps/search/components/ListItemInfo.tsx
+++ b/scripts/apps/search/components/ListItemInfo.tsx
@@ -6,6 +6,7 @@ import {flatMap} from 'lodash';
 import {extensions} from 'appConfig';
 import {IDesk, IArticle, IListViewFieldWithOptions} from 'superdesk-api';
 import {IRelatedEntities} from 'core/getRelatedEntities';
+import {Loader} from 'superdesk-ui-framework/react';
 
 export interface IPropsItemListInfo {
     item: IArticle;
@@ -14,6 +15,7 @@ export interface IPropsItemListInfo {
     ingestProvider: any;
     profilesById: any;
     highlightsById: any;
+    loading?: boolean;
     markedDesksById: any;
     openAuthoringView: (rewrittenBy?: string) => void;
     narrow: any;
@@ -69,6 +71,7 @@ export class ListItemInfo extends React.PureComponent<IPropsItemListInfo> {
                 className={className}
                 style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center'}}
             >
+                {this.props.loading && <Loader overlay />}
                 {listItems}
                 {
                     articleDisplayWidgets.length < 1 ? null : (
diff --git a/scripts/core/helpers/network.tsx b/scripts/core/helpers/network.tsx
index 1b4249715c..5ddd20ea48 100644
--- a/scripts/core/helpers/network.tsx
+++ b/scripts/core/helpers/network.tsx
@@ -1,5 +1,6 @@
 import ng from 'core/services/ng';
 import {appConfig} from '../../appConfig';
+import {notify} from 'core/notify/notify';
 
 interface IHttpRequestOptions {
     method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
@@ -173,3 +174,30 @@ export function uploadFileWithProgress<T>(
             });
         });
 }
+
+export function trackArticleActionProgress<T>(
+    getPromise: () => Promise<T>,
+    itemId: string,
+    successMessage: string,
+    errorMessage: string,
+): Promise<T> {
+    dispatchEvent(new CustomEvent('article-action-loading', {
+        detail: {loading: true, itemId},
+    }));
+
+    return getPromise()
+        .then((res) => {
+            notify.success(successMessage);
+
+            return res;
+        }).catch((error) => {
+            notify.error(errorMessage);
+
+            return error;
+        })
+        .finally(() => {
+            dispatchEvent(new CustomEvent('article-action-loading', {
+                detail: {loading: false, itemId},
+            }));
+        });
+}

From 25c8b35fe22f75edaa13b5b53e94accfb0bcda89 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Mon, 4 Nov 2024 11:08:12 +0200
Subject: [PATCH 08/14] Add notification for bulk action, adjust based on
 mark/unmark (#4681)

---
 .../SetHighlightsForMultipleArticlesModal.tsx       | 12 +++++++++++-
 .../apps/highlights/services/HighlightsService.ts   | 13 +++++++------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/scripts/apps/highlights/components/SetHighlightsForMultipleArticlesModal.tsx b/scripts/apps/highlights/components/SetHighlightsForMultipleArticlesModal.tsx
index 5aa7b0c163..ca4a73dc97 100644
--- a/scripts/apps/highlights/components/SetHighlightsForMultipleArticlesModal.tsx
+++ b/scripts/apps/highlights/components/SetHighlightsForMultipleArticlesModal.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
-import {gettext} from 'core/utils';
+import {getArticleLabel, gettext} from 'core/utils';
 import {connectServices} from 'core/helpers/ReactRenderAsync';
 import {IDesk, IArticle} from 'superdesk-api';
 import {getHighlightsLabel, IHighlight} from '../services/HighlightsService';
 import {Modal} from 'superdesk-ui-framework/react/components/Modal';
 import {Button, ButtonGroup} from 'superdesk-ui-framework/react';
+import {notify} from 'core/notify/notify';
 
 interface IProps {
     closeModal(): void;
@@ -28,6 +29,7 @@ export function getModalForMultipleHighlights(articles: Array<IArticle>, deskId:
             this.handleChange = this.handleChange.bind(this);
             this.markHighlights = this.markHighlights.bind(this);
         }
+
         componentDidMount() {
             this.props.highlightsService.get(deskId).then((res) => {
                 this.setState({
@@ -35,6 +37,7 @@ export function getModalForMultipleHighlights(articles: Array<IArticle>, deskId:
                 });
             });
         }
+
         markHighlights() {
             var promises = Promise.resolve();
 
@@ -42,6 +45,11 @@ export function getModalForMultipleHighlights(articles: Array<IArticle>, deskId:
                 this.state.selectedHighlights.forEach((highlightId) => {
                     if (article.highlights == null || article.highlights.includes(highlightId) === false) {
                         promises.then(() => this.props.highlightsService.markItem(highlightId, article));
+                    } else {
+                        notify.error(gettext(
+                            'Article {{slug}} is already marked for this highlight',
+                            {slug: getArticleLabel(article)},
+                        ));
                     }
                 });
             });
@@ -50,6 +58,7 @@ export function getModalForMultipleHighlights(articles: Array<IArticle>, deskId:
                 this.props.closeModal();
             });
         }
+
         handleChange(event: React.ChangeEvent<HTMLSelectElement>) {
             const selected = [];
             const {options} = event.target;
@@ -66,6 +75,7 @@ export function getModalForMultipleHighlights(articles: Array<IArticle>, deskId:
                 selectedHighlights: selected,
             });
         }
+
         render() {
             if (this.state.highlightsForDesk == null) {
                 return null;
diff --git a/scripts/apps/highlights/services/HighlightsService.ts b/scripts/apps/highlights/services/HighlightsService.ts
index f16e2d352e..2463fea6fe 100644
--- a/scripts/apps/highlights/services/HighlightsService.ts
+++ b/scripts/apps/highlights/services/HighlightsService.ts
@@ -1,8 +1,7 @@
 import _ from 'lodash';
 import {gettext} from 'core/utils';
 import {IPackagesService} from 'types/Services/Packages';
-import {IBaseRestApiResponse} from 'superdesk-api';
-import {notify} from 'core/notify/notify';
+import {IArticle, IBaseRestApiResponse} from 'superdesk-api';
 import {trackArticleActionProgress} from 'core/helpers/network';
 
 export interface IHighlight extends IBaseRestApiResponse {
@@ -112,17 +111,19 @@ export function HighlightsService(api, $q, $cacheFactory, packages: IPackagesSer
     };
 
     /**
-     * Mark an item for a highlight
+     * Mark/Unmark an item for a highlight
      */
-    service.markItem = function(highlight, markedItem) {
+    service.markItem = function(highlight: string, markedItem: IArticle) {
+        const addToHighlight = (markedItem.highlights ?? []).includes(highlight) === false;
+
         return trackArticleActionProgress(
             () => api.save(
                 'marked_for_highlights',
                 {highlights: [highlight], marked_item: markedItem._id},
             ),
             markedItem._id,
-            gettext('Item marked'),
-            gettext('Couldn\'t mark item'),
+            addToHighlight ? gettext('Item marked') : gettext('Item unmarked'),
+            addToHighlight ? gettext('Couldn\'t mark item') : gettext('Couldn\'t unmark item'),
         );
     };
 

From 7c337576d7e9adb003358b5ff0809a150ccd81c1 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Fri, 18 Oct 2024 11:58:10 +0300
Subject: [PATCH 09/14] Add more z-index fixes (#4665)

---
 .../authoring-react/article-widgets/comments/index.tsx   | 9 ++++++++-
 scripts/apps/authoring/comments/comments.ts              | 7 ++++++-
 scripts/apps/authoring/views/change-image.html           | 2 +-
 scripts/core/activity/views/activity-modal.html          | 2 +-
 .../editor3/components/HighlightsPopupPositioner.tsx     | 3 ++-
 .../editor3/components/annotations/AnnotationInput.tsx   | 2 +-
 scripts/core/menu/views/superdesk-view.html              | 2 +-
 7 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/scripts/apps/authoring-react/article-widgets/comments/index.tsx b/scripts/apps/authoring-react/article-widgets/comments/index.tsx
index 08e7bc21ea..34341d35ac 100644
--- a/scripts/apps/authoring-react/article-widgets/comments/index.tsx
+++ b/scripts/apps/authoring-react/article-widgets/comments/index.tsx
@@ -4,6 +4,7 @@ import {IArticleSideWidget, IArticleSideWidgetComponentType, IComment, IRestApiR
 import {gettext} from 'core/utils';
 import CommentsWidget from '../../generic-widgets/comments/CommentsWidget';
 import {httpRequestJsonLocal} from 'core/helpers/network';
+import {notify} from 'core/notify/notify';
 // Can't call `gettext` in the top level
 const getLabel = () => gettext('Comments');
 
@@ -49,7 +50,13 @@ class Component extends React.PureComponent<IArticleSideWidgetComponentType> {
                             item: this.props.article._id,
                             text: text,
                         },
-                    });
+                    })
+                        .then((res: void) => res)
+                        .catch((error) => {
+                            if (error.data._issues?.text != null) {
+                                notify.error(error.data._issues.text);
+                            }
+                        });
                 }}
             />
         );
diff --git a/scripts/apps/authoring/comments/comments.ts b/scripts/apps/authoring/comments/comments.ts
index 3616391789..e03204a0a4 100644
--- a/scripts/apps/authoring/comments/comments.ts
+++ b/scripts/apps/authoring/comments/comments.ts
@@ -1,3 +1,4 @@
+import {notify} from 'core/notify/notify';
 import {gettext} from 'core/utils';
 import {each} from 'lodash';
 
@@ -22,7 +23,11 @@ function CommentsService(api) {
     };
 
     this.save = function(comment) {
-        return api.item_comments.save(comment);
+        return api.item_comments.save(comment).catch((error) => {
+            if (error.data._issues?.text != null) {
+                notify.error(error.data._issues.text);
+            }
+        });
     };
 }
 
diff --git a/scripts/apps/authoring/views/change-image.html b/scripts/apps/authoring/views/change-image.html
index dcf6484569..5fa63af5de 100644
--- a/scripts/apps/authoring/views/change-image.html
+++ b/scripts/apps/authoring/views/change-image.html
@@ -1,4 +1,4 @@
-<div class="modal__header modal__header--flex" data-test-id="change-image" data-theme="dark-ui">
+<div class="modal__header modal__header--flex" style="z-index:1051" data-test-id="change-image" data-theme="dark-ui">
     <h3 class="modal__heading modal__heading--no-grow" ng-if="!nav || nav === 'view'">{{ :: activity.label}}</h3>
     <h3 class="modal__heading modal__heading--no-grow" ng-if="nav === 'image-edit'">{{ :: 'Edit image' | translate }}</h3>
     <h3 class="modal__heading modal__heading--no-grow" ng-if="nav === 'crop'">{{ :: 'Edit Crops' | translate }}</h3>
diff --git a/scripts/core/activity/views/activity-modal.html b/scripts/core/activity/views/activity-modal.html
index 63129fa33f..8e54206c33 100644
--- a/scripts/core/activity/views/activity-modal.html
+++ b/scripts/core/activity/views/activity-modal.html
@@ -1,4 +1,4 @@
-<div class="modal in {{activity.cssClass}}" ng-if="activity">
+<div style="z-index: 1051 !important;" class="modal in {{activity.cssClass}}" ng-if="activity">
     <div class="modal__dialog" ng-controller="activity.controller">
         <div class="modal__content" ng-include="activity.templateUrl"></div>
     </div>
diff --git a/scripts/core/editor3/components/HighlightsPopupPositioner.tsx b/scripts/core/editor3/components/HighlightsPopupPositioner.tsx
index e87451f102..0d35f03725 100644
--- a/scripts/core/editor3/components/HighlightsPopupPositioner.tsx
+++ b/scripts/core/editor3/components/HighlightsPopupPositioner.tsx
@@ -27,7 +27,8 @@ function getNextPosition(originalElement, editorNode) {
     element.style.bottom = '';
     mainFlexElement.style['max-height'] = '';
 
-    element.style.left = (editorNode.getBoundingClientRect().left - 360) + 'px';
+    // Math.abs is needed, so that the popover is never positioned outside of the viewport
+    element.style.left = `${Math.abs(editorNode.getBoundingClientRect().left - 360)}px`;
 
     const paddingBlockStart = 4;
     const paddingBlockEnd = 4;
diff --git a/scripts/core/editor3/components/annotations/AnnotationInput.tsx b/scripts/core/editor3/components/annotations/AnnotationInput.tsx
index 0a66a1783e..c5591d91b3 100644
--- a/scripts/core/editor3/components/annotations/AnnotationInput.tsx
+++ b/scripts/core/editor3/components/annotations/AnnotationInput.tsx
@@ -298,7 +298,7 @@ class AnnotationInputBody extends React.Component<IProps, IState> {
                 ref={(component) => {
                     this.positionerRef = component;
                 }}
-                zIndex={90}
+                zIndex={1051}
             >
                 <Card padding={10}>
                     <div className="annotation-input" style={{width: 460}}>
diff --git a/scripts/core/menu/views/superdesk-view.html b/scripts/core/menu/views/superdesk-view.html
index a3cfd25bc5..f65401aa44 100644
--- a/scripts/core/menu/views/superdesk-view.html
+++ b/scripts/core/menu/views/superdesk-view.html
@@ -34,7 +34,7 @@
 
 <div id="main-container" ng-class="superdesk.flags" ng-if="renderMonitoring && superdesk.flags.workspace === false" ng-view></div>
 
-<div id="react-placeholder"></div>
+<div style="z-index: 1051 !important" id="react-placeholder"></div>
 <div id="react-backdrop"></div>
 
 <div sd-activity-modal></div>

From 18c5362b74ae895b7a50ce47d3357d137edce63b Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Wed, 16 Oct 2024 11:41:19 +0300
Subject: [PATCH 10/14] Update UIF, change button name (#4661)

---
 package-lock.json                             | 252 +++++-------------
 package.json                                  |   2 +-
 .../comments/views/comments-widget.html       |   2 +-
 3 files changed, 63 insertions(+), 193 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ab173ae11..daad6a77d3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -586,9 +586,9 @@
       },
       "dependencies": {
         "tslib": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
-          "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ=="
+          "version": "2.8.1",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+          "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
         }
       }
     },
@@ -654,14 +654,6 @@
         "@types/react": "*"
       }
     },
-    "@types/enzyme-adapter-react-16": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@types/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.9.tgz",
-      "integrity": "sha512-z24MMxGtUL8HhXdye3tWzjp+19QTsABqLaX2oOZpxMPHRJgLfahQmOeTTrEBQd9ogW20+UmPBXD9j+XOasFHvw==",
-      "requires": {
-        "@types/enzyme": "*"
-      }
-    },
     "@types/hoist-non-react-statics": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz",
@@ -1304,6 +1296,7 @@
       "version": "2.16.0",
       "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz",
       "integrity": "sha512-7WHOFolP/6cS96PhKNrslCLMYAI8yB1Pp6u6XmxozQOiZbsI5ycglZr5cHhBFfuRcQQjzCMith5ZPZdYiJCxUg==",
+      "dev": true,
       "requires": {
         "array.prototype.find": "^2.1.1",
         "function.prototype.name": "^1.1.2",
@@ -1319,12 +1312,14 @@
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+          "dev": true
         },
         "prop-types": {
           "version": "15.8.1",
           "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
           "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+          "dev": true,
           "requires": {
             "loose-envify": "^1.4.0",
             "object-assign": "^4.1.1",
@@ -1629,6 +1624,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.0.tgz",
       "integrity": "sha512-TfO1gz+tLm+Bswq0FBOXPqAchtCr2Rn48T8dLJoRFl8NoEosjZmzptmuo1X8aZBzZcqsR1W8U761tjACJtngTQ==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
@@ -1641,6 +1637,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.2.1.tgz",
       "integrity": "sha512-I2ri5Z9uMpMvnsNrHre9l3PaX+z9D0/z6F7Yt2u15q7wt0I62g5kX6xUKR1SJiefgG+u2/gJUmM8B47XRvQR6w==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -1819,6 +1816,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz",
       "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.0",
         "define-properties": "^1.1.3",
@@ -3794,7 +3792,8 @@
     "discontinuous-range": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/discontinuous-range/-/discontinuous-range-1.0.0.tgz",
-      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ=="
+      "integrity": "sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==",
+      "dev": true
     },
     "dns-equal": {
       "version": "1.0.0",
@@ -4236,6 +4235,7 @@
       "version": "1.15.7",
       "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.7.tgz",
       "integrity": "sha512-LtjKgvlTc/H7adyQcj+aq0P0H07LDL480WQl1gU512IUyaDo/sbOaNDdZsJXYW2XaoPqrLLE9KbZS+X2z6BASw==",
+      "dev": true,
       "requires": {
         "enzyme-adapter-utils": "^1.14.1",
         "enzyme-shallow-equal": "^1.0.5",
@@ -4349,7 +4349,8 @@
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+          "dev": true
         },
         "object-inspect": {
           "version": "1.12.2",
@@ -4371,6 +4372,7 @@
           "version": "1.1.6",
           "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz",
           "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==",
+          "dev": true,
           "requires": {
             "call-bind": "^1.0.2",
             "define-properties": "^1.1.4",
@@ -4381,6 +4383,7 @@
           "version": "15.8.1",
           "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
           "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+          "dev": true,
           "requires": {
             "loose-envify": "^1.4.0",
             "object-assign": "^4.1.1",
@@ -4400,7 +4403,8 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         },
         "string.prototype.trim": {
           "version": "1.2.7",
@@ -4449,6 +4453,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.14.1.tgz",
       "integrity": "sha512-JZgMPF1QOI7IzBj24EZoDpaeG/p8Os7WeBZWTJydpsH7JRStc7jYbHE4CmNQaLqazaGFyLM8ALWA3IIZvxW3PQ==",
+      "dev": true,
       "requires": {
         "airbnb-prop-types": "^2.16.0",
         "function.prototype.name": "^1.1.5",
@@ -4551,7 +4556,8 @@
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+          "dev": true
         },
         "object-inspect": {
           "version": "1.12.2",
@@ -4584,6 +4590,7 @@
           "version": "2.0.6",
           "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz",
           "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==",
+          "dev": true,
           "requires": {
             "call-bind": "^1.0.2",
             "define-properties": "^1.1.4",
@@ -4594,6 +4601,7 @@
               "version": "1.1.4",
               "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
               "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
+              "dev": true,
               "requires": {
                 "has-property-descriptors": "^1.0.0",
                 "object-keys": "^1.1.1"
@@ -4605,6 +4613,7 @@
           "version": "15.8.1",
           "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
           "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+          "dev": true,
           "requires": {
             "loose-envify": "^1.4.0",
             "object-assign": "^4.1.1",
@@ -4624,7 +4633,8 @@
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "dev": true
         },
         "string.prototype.trim": {
           "version": "1.2.7",
@@ -4706,6 +4716,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.5.tgz",
       "integrity": "sha512-i6cwm7hN630JXenxxJFBKzgLC3hMTafFQXflvzHgPmDhOBhxUWDe8AeRv1qp2/uWJ2Y8z5yLWMzmAfkTOiOCZg==",
+      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object-is": "^1.1.5"
@@ -4758,12 +4769,14 @@
     "es-array-method-boxes-properly": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
-      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA=="
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
     },
     "es-shim-unscopables": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
       "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
+      "dev": true,
       "requires": {
         "has": "^1.0.3"
       }
@@ -6097,6 +6110,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.4.tgz",
       "integrity": "sha512-iqy1pIotY/RmhdFZygSSlW0wko2yxkSCKqsuv4pr8QESohpYyG/Z7B/XXvPRKTJS//960rgguE5mSRUsDdaJrQ==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
@@ -7067,6 +7081,7 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/html-element-map/-/html-element-map-1.3.1.tgz",
       "integrity": "sha512-6XMlxrAFX4UEEGxctfFnmrFaaZFNf9i5fNuV5wZ3WWQ4FVaNP1aX1LkX9j2mfEx1NpjeE/rL3nmgEn23GdFmrg==",
+      "dev": true,
       "requires": {
         "array.prototype.filter": "^1.0.0",
         "call-bind": "^1.0.2"
@@ -7965,7 +7980,8 @@
     "is-subset": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz",
-      "integrity": "sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw=="
+      "integrity": "sha512-6Ybun0IkarhmEqxXCNw/C0bna6Zb/TkfUX9UbwJtK6ObwAVCxmAP308WWTHviM/zAqXk05cdhYsUsZeGQh99iw==",
+      "dev": true
     },
     "is-svg": {
       "version": "2.1.0",
@@ -8659,11 +8675,6 @@
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
       "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "lodash.escape": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-4.0.1.tgz",
-      "integrity": "sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw=="
-    },
     "lodash.filter": {
       "version": "4.6.0",
       "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz",
@@ -8677,7 +8688,8 @@
     "lodash.flattendeep": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
-      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ=="
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
     },
     "lodash.foreach": {
       "version": "4.5.0",
@@ -8687,7 +8699,8 @@
     "lodash.isequal": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
-      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
+      "integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==",
+      "dev": true
     },
     "lodash.map": {
       "version": "4.6.0",
@@ -9096,7 +9109,8 @@
     "moo": {
       "version": "0.5.1",
       "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.1.tgz",
-      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w=="
+      "integrity": "sha512-I1mnb5xn4fO80BH9BLcF0yLypy2UKl+Cb01Fu0hJRkJjlCRtxZMWkTdAtDd5ZqCOxtCkhmRwyI57vWT+1iZ67w==",
+      "dev": true
     },
     "ms": {
       "version": "2.1.2",
@@ -9174,6 +9188,7 @@
       "version": "2.20.1",
       "resolved": "https://registry.npmjs.org/nearley/-/nearley-2.20.1.tgz",
       "integrity": "sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==",
+      "dev": true,
       "requires": {
         "commander": "^2.19.0",
         "moo": "^0.5.0",
@@ -9184,7 +9199,8 @@
         "commander": {
           "version": "2.20.3",
           "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+          "dev": true
         }
       }
     },
@@ -10872,6 +10888,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz",
       "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==",
+      "dev": true,
       "requires": {
         "has": "^1.0.3",
         "object.assign": "^4.1.0",
@@ -11006,6 +11023,7 @@
       "version": "3.4.1",
       "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
       "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+      "dev": true,
       "requires": {
         "performance-now": "^2.1.0"
       }
@@ -11018,12 +11036,14 @@
     "railroad-diagrams": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz",
-      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A=="
+      "integrity": "sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==",
+      "dev": true
     },
     "randexp": {
       "version": "0.4.6",
       "resolved": "https://registry.npmjs.org/randexp/-/randexp-0.4.6.tgz",
       "integrity": "sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==",
+      "dev": true,
       "requires": {
         "discontinuous-range": "1.0.0",
         "ret": "~0.1.10"
@@ -11362,6 +11382,7 @@
       "version": "16.14.0",
       "resolved": "https://registry.npmjs.org/react-test-renderer/-/react-test-renderer-16.14.0.tgz",
       "integrity": "sha512-L8yPjqPE5CZO6rKsKXRO/rVPiaCOy0tQQJbC+UjPNlobl5mad59lvPjwFsQHTvL03caVDIVr9x9/OSgDe6I5Eg==",
+      "dev": true,
       "requires": {
         "object-assign": "^4.1.1",
         "prop-types": "^15.6.2",
@@ -11372,12 +11393,14 @@
         "object-assign": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+          "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+          "dev": true
         },
         "prop-types": {
           "version": "15.7.2",
           "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
           "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+          "dev": true,
           "requires": {
             "loose-envify": "^1.4.0",
             "object-assign": "^4.1.1",
@@ -11388,6 +11411,7 @@
           "version": "0.19.1",
           "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
           "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+          "dev": true,
           "requires": {
             "loose-envify": "^1.1.0",
             "object-assign": "^4.1.1"
@@ -11586,7 +11610,8 @@
     "reflect.ownkeys": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz",
-      "integrity": "sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg=="
+      "integrity": "sha512-qOLsBKHCpSOFKK1NUOCGC5VyeufB6lEsFe92AL2bhIJsacZS1qdoOZSbPk3MYKuT2cFlRDnulKXuuElIrMjGUg==",
+      "dev": true
     },
     "regenerate": {
       "version": "1.4.2",
@@ -11863,6 +11888,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz",
       "integrity": "sha512-nDG1rZeP6oFTLN6yNDV/uiAvs1+FS/KlrEwh7+y7dpuApDBy6bI2HTBcc0/V8lv9OTqfyD34eF7au2pm8aBbhA==",
+      "dev": true,
       "requires": {
         "lodash.flattendeep": "^4.4.0",
         "nearley": "^2.7.10"
@@ -12999,6 +13025,7 @@
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.4.tgz",
       "integrity": "sha512-hWCk/iqf7lp0/AgTF7/ddO1IWtSNPASjlzCicV5irAVdE1grjsneK26YG6xACMBEdCvO8fUST0UzDMh/2Qy+9Q==",
+      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3",
@@ -13560,21 +13587,16 @@
       }
     },
     "superdesk-ui-framework": {
-      "version": "3.1.18",
-      "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.1.18.tgz",
-      "integrity": "sha512-5srF6IXkuZTN39gWnfayBKo6X81ce32mf30mI54ju7Rw5jSV1eKty9pxoWJLW6ZLfKDRJtpNy+hCrR1CY0QpfQ==",
+      "version": "3.1.23",
+      "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.1.23.tgz",
+      "integrity": "sha512-0p7polXtSz/0jGizk/y/GIVPAazoPBR4U2PIE4BOx6xxRMH1phbp/c9hqbH46JgDOFcznuyJS/82XWbMeDgGfw==",
       "requires": {
         "@popperjs/core": "^2.4.0",
         "@superdesk/common": "0.0.28",
         "@superdesk/primereact": "^5.0.2-12",
         "@superdesk/react-resizable-panels": "0.0.39",
-        "@types/enzyme-adapter-react-16": "^1.0.6",
-        "@types/node": "^14.10.2",
         "chart.js": "^2.9.3",
         "date-fns": "2.7.0",
-        "enzyme": "^3.11.0",
-        "enzyme-adapter-react-16": "^1.15.7",
-        "moment": "^2.29.3",
         "popper-max-size-modifier": "^0.2.0",
         "popper.js": "1.14.4",
         "primeicons": "2.0.0",
@@ -13596,162 +13618,10 @@
             "react-sortable-hoc": "^1.11.0"
           }
         },
-        "@types/node": {
-          "version": "14.18.63",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz",
-          "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ=="
-        },
-        "cheerio": {
-          "version": "1.0.0-rc.12",
-          "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-          "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-          "requires": {
-            "cheerio-select": "^2.1.0",
-            "dom-serializer": "^2.0.0",
-            "domhandler": "^5.0.3",
-            "domutils": "^3.0.1",
-            "htmlparser2": "^8.0.1",
-            "parse5": "^7.0.0",
-            "parse5-htmlparser2-tree-adapter": "^7.0.0"
-          }
-        },
-        "cheerio-select": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-          "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-select": "^5.1.0",
-            "css-what": "^6.1.0",
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.3",
-            "domutils": "^3.0.1"
-          }
-        },
-        "css-select": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-          "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-          "requires": {
-            "boolbase": "^1.0.0",
-            "css-what": "^6.1.0",
-            "domhandler": "^5.0.2",
-            "domutils": "^3.0.1",
-            "nth-check": "^2.0.1"
-          }
-        },
-        "css-what": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-          "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-        },
         "date-fns": {
           "version": "2.7.0",
           "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.7.0.tgz",
           "integrity": "sha512-wxYp2PGoUDN5ZEACc61aOtYFvSsJUylIvCjpjDOqM1UDaKIIuMJ9fAnMYFHV3TQaDpfTVxhwNK/GiCaHKuemTA=="
-        },
-        "dom-serializer": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-          "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-          "requires": {
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.2",
-            "entities": "^4.2.0"
-          }
-        },
-        "domelementtype": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-          "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-        },
-        "domhandler": {
-          "version": "5.0.3",
-          "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-          "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-          "requires": {
-            "domelementtype": "^2.3.0"
-          }
-        },
-        "domutils": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-          "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-          "requires": {
-            "dom-serializer": "^2.0.0",
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.3"
-          }
-        },
-        "entities": {
-          "version": "4.5.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-          "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
-        },
-        "enzyme": {
-          "version": "3.11.0",
-          "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-3.11.0.tgz",
-          "integrity": "sha512-Dw8/Gs4vRjxY6/6i9wU0V+utmQO9kvh9XLnz3LIudviOnVYDEe2ec+0k+NQoMamn1VrjKgCUOWj5jG/5M5M0Qw==",
-          "requires": {
-            "array.prototype.flat": "^1.2.3",
-            "cheerio": "^1.0.0-rc.3",
-            "enzyme-shallow-equal": "^1.0.1",
-            "function.prototype.name": "^1.1.2",
-            "has": "^1.0.3",
-            "html-element-map": "^1.2.0",
-            "is-boolean-object": "^1.0.1",
-            "is-callable": "^1.1.5",
-            "is-number-object": "^1.0.4",
-            "is-regex": "^1.0.5",
-            "is-string": "^1.0.5",
-            "is-subset": "^0.1.1",
-            "lodash.escape": "^4.0.1",
-            "lodash.isequal": "^4.5.0",
-            "object-inspect": "^1.7.0",
-            "object-is": "^1.0.2",
-            "object.assign": "^4.1.0",
-            "object.entries": "^1.1.1",
-            "object.values": "^1.1.1",
-            "raf": "^3.4.1",
-            "rst-selector-parser": "^2.2.3",
-            "string.prototype.trim": "^1.2.1"
-          }
-        },
-        "htmlparser2": {
-          "version": "8.0.2",
-          "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-          "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-          "requires": {
-            "domelementtype": "^2.3.0",
-            "domhandler": "^5.0.3",
-            "domutils": "^3.0.1",
-            "entities": "^4.4.0"
-          }
-        },
-        "nth-check": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-          "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-          "requires": {
-            "boolbase": "^1.0.0"
-          }
-        },
-        "parse5": {
-          "version": "7.1.2",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-          "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-          "requires": {
-            "entities": "^4.4.0"
-          }
-        },
-        "parse5-htmlparser2-tree-adapter": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-          "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-          "requires": {
-            "domhandler": "^5.0.2",
-            "parse5": "^7.0.0"
-          }
         }
       }
     },
diff --git a/package.json b/package.json
index 1b3de21812..ca1c18b8e1 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "sass-loader": "6.0.6",
     "shortid": "2.2.8",
     "style-loader": "0.20.2",
-    "superdesk-ui-framework": "^3.1.18",
+    "superdesk-ui-framework": "^3.1.23",
     "ts-loader": "3.5.0",
     "typescript": "4.9.5",
     "uuid": "8.3.1",
diff --git a/scripts/apps/authoring/comments/views/comments-widget.html b/scripts/apps/authoring/comments/views/comments-widget.html
index 1ac068f8f3..1ba7ffd124 100644
--- a/scripts/apps/authoring/comments/views/comments-widget.html
+++ b/scripts/apps/authoring/comments/views/comments-widget.html
@@ -54,7 +54,7 @@ <h3 class="panel-info__heading" translate>No comments so far.</h3>
                 >
                     Post
                 </button>
-                <button class="btn pull-right" ng-click="cancel()" ng-show="!saveEnterFlag" translate>Cancel</button>
+                <button class="btn pull-right" ng-click="cancel()" ng-show="!saveEnterFlag" translate>Clear</button>
             </div>
         </form>
     </div>

From bcd9ebfff53d89ea7d76f616059cebc3c91f4504 Mon Sep 17 00:00:00 2001
From: Petr Jasek <jasekpetr@gmail.com>
Date: Fri, 25 Oct 2024 15:02:37 +0200
Subject: [PATCH 11/14] release 2.8.1

---
 package-lock.json | 2 +-
 package.json      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index daad6a77d3..779c421786 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "superdesk-core",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index ca1c18b8e1..12595ca296 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "superdesk-core",
-  "version": "2.8.0",
+  "version": "2.8.1",
   "license": "AGPL-3.0",
   "repository": {
     "type": "git",

From d5bd677df0cc36c73b730004cff2ad5c678bd4ee Mon Sep 17 00:00:00 2001
From: Nikola Stojanovic <68916411+dzonidoo@users.noreply.github.com>
Date: Mon, 25 Nov 2024 09:20:11 +0100
Subject: [PATCH 12/14] Add to planning dialog is frozen on CP instances
 (#4691)

* zIndex prop

* fix lint
---
 scripts/core/activity/views/activity-modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/core/activity/views/activity-modal.html b/scripts/core/activity/views/activity-modal.html
index 8e54206c33..b48ce77a52 100644
--- a/scripts/core/activity/views/activity-modal.html
+++ b/scripts/core/activity/views/activity-modal.html
@@ -1,4 +1,4 @@
-<div style="z-index: 1051 !important;" class="modal in {{activity.cssClass}}" ng-if="activity">
+<div  ng-style="!activity.zIndex ? {'z-index': '1051'} : {'z-index': activity.zIndex}"  class="modal in {{activity.cssClass}}" ng-if="activity">
     <div class="modal__dialog" ng-controller="activity.controller">
         <div class="modal__content" ng-include="activity.templateUrl"></div>
     </div>

From b901fd344fb7a38b23b4a8282fefd488767d70c4 Mon Sep 17 00:00:00 2001
From: Konstantin Markov <maga.ot.oz@protonmail.com>
Date: Mon, 25 Nov 2024 11:23:09 +0200
Subject: [PATCH 13/14] Pin chrome version (#4690)

---
 .github/workflows/tests.yml   | 33 +++++++++++----------------------
 e2e/client/protractor.conf.js |  2 +-
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5d266027fa..4ba2b1bac7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,78 +1,67 @@
 name: "CI"
-
 on:
   [push, pull_request]
-
 jobs:
-
   test:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v4
-
     - uses: actions/setup-node@v4
       with:
         node-version: '14.x'
-
     # avoid file watch limit error
     - run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-
     - run: npm ci
     - run: npm run test || npm run test || npm run test
       env:
         TZ: "Europe/Prague"
-
   e2e:
     runs-on: ubuntu-latest
-
     strategy:
       fail-fast: false
       matrix:
         suite: [a, b]
-
     steps:
     - uses: actions/checkout@v4
-
     - uses: actions/setup-node@v4
       with:
         node-version: '14.x'
-
-
     - name: Start e2e server
       run: |
         docker compose pull
         docker compose build
         docker compose up -d
       working-directory: e2e/server
-
     - name: Build client
       run: npm install && npm run build && npm run specs--compile && npm run start-client-server
       working-directory: e2e/client
-
     # playwright start
-
     - name: Install Playwright Browsers
       run: npx playwright install --with-deps
       working-directory: e2e/client
-
     - name: Run Playwright tests
       run: npx playwright test
       working-directory: e2e/client
-
     - uses: actions/upload-artifact@v4
       with:
         name: playwright-report-${{ matrix.suite }}
         path: e2e/client/test-results
-
     # playwright end
 
     # protractor start
+    - name: Setup Chrome
+      uses: browser-actions/setup-chrome@v1
+      id: setup-chrome
+      with:
+        chrome-version: 127.0.6533.99
+        install-dependencies: true
+        install-chromedriver: true
 
-    - name: Protractor
-      run: npx protractor-flake --parser standard  --max-attempts=3 -- protractor.conf.js --suite=${{ matrix.suite }}
+    - name: Run Protractor
+      run: npx protractor-flake --parser standard --max-attempts=3 -- protractor.conf.js --suite=${{ matrix.suite }}
       env:
+        CHROME_BIN: ${{ steps.setup-chrome.outputs.chrome-path }}
+        CHROMEWEBDRIVER: ${{ steps.setup-chrome.outputs.chromedriver-path }}
         TRAVIS: ci
         SCREENSHOTS_DIR: /tmp
       working-directory: e2e/client
diff --git a/e2e/client/protractor.conf.js b/e2e/client/protractor.conf.js
index a5950fed3e..d614689312 100644
--- a/e2e/client/protractor.conf.js
+++ b/e2e/client/protractor.conf.js
@@ -53,7 +53,7 @@ var config = {
 
     directConnect: true,
 
-    chromeDriver: process.env.CHROMEWEBDRIVER ? (process.env.CHROMEWEBDRIVER + '/chromedriver') : null,
+    chromeDriver: process.env.CHROMEWEBDRIVER ? process.env.CHROMEWEBDRIVER : null,
 
     onPrepare: function() {
         execSync(

From f4aaad9f8feafd76e2f0c60e968f5aceea646be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= <jasekpetr@gmail.com>
Date: Tue, 3 Dec 2024 10:03:10 +0100
Subject: [PATCH 14/14] lock ui framework version (#4694)

* lock ui framework version

to avoid getting updates without having them tested

* use .24
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 779c421786..e92c02888f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13587,9 +13587,9 @@
       }
     },
     "superdesk-ui-framework": {
-      "version": "3.1.23",
-      "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.1.23.tgz",
-      "integrity": "sha512-0p7polXtSz/0jGizk/y/GIVPAazoPBR4U2PIE4BOx6xxRMH1phbp/c9hqbH46JgDOFcznuyJS/82XWbMeDgGfw==",
+      "version": "3.1.24",
+      "resolved": "https://registry.npmjs.org/superdesk-ui-framework/-/superdesk-ui-framework-3.1.24.tgz",
+      "integrity": "sha512-7OdcM1rQ6S84mmRKgavi9Twb+LIOLGBNWn8uPHE61Eswy5s3acSgVksr80K5pTrLc6QeQCoCJZPItEQ61jlTGQ==",
       "requires": {
         "@popperjs/core": "^2.4.0",
         "@superdesk/common": "0.0.28",
diff --git a/package.json b/package.json
index 12595ca296..3868a6f9ac 100644
--- a/package.json
+++ b/package.json
@@ -123,7 +123,7 @@
     "sass-loader": "6.0.6",
     "shortid": "2.2.8",
     "style-loader": "0.20.2",
-    "superdesk-ui-framework": "^3.1.23",
+    "superdesk-ui-framework": "3.1.24",
     "ts-loader": "3.5.0",
     "typescript": "4.9.5",
     "uuid": "8.3.1",