Show modal if no highlights are configured & small improvements (#4198)

superdesk · Feb 8, 2023 · 98cf62e · 98cf62e
1 parent af644e4
commit 98cf62e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/scripts/apps/authoring-react/authoring-integration-wrapper.tsx b/scripts/apps/authoring-react/authoring-integration-wrapper.tsx
@@ -182,21 +182,23 @@ const getExportModal = (
 
 const getHighlightsAction = (getItem: () => IArticle): IAuthoringAction => {
     const showHighlightsModal = () => {
-        showModal(({closeModal}) => {
-            return (
-                <HighlightsModal
-                    article={getItem()}
-                    closeModal={closeModal}
-                />
-            );
+        sdApi.highlights.fetchHighlights().then((res) => {
+            if (res._items.length === 0) {
+                ui.alert(gettext('No highlights have been created yet.'));
+            } else {
+                showModal(({closeModal}) => (
+                    <HighlightsModal
+                        article={getItem()}
+                        closeModal={closeModal}
+                    />
+                ));
+            }
         });
     };
 
     return {
         label: gettext('Highlights'),
-        onTrigger: () => (
-            showHighlightsModal()
-        ),
+        onTrigger: () => showHighlightsModal(),
         keyBindings: {
             'ctrl+shift+h': () => {
                 showHighlightsModal();

diff --git a/scripts/core/ui-utils.tsx b/scripts/core/ui-utils.tsx
@@ -7,6 +7,7 @@ export const ui = {
         showModal(({closeModal}) => {
             return (
                 <Modal
+                    position="top"
                     visible
                     onHide={closeModal}
                     zIndex={1050}