Lint

superdesk · Nov 13, 2024 · a5ef6ab · a5ef6ab
1 parent 570e447
commit a5ef6ab
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 31 deletions.
diff --git a/scripts/apps/authoring-react/authoring-integration-wrapper.tsx b/scripts/apps/authoring-react/authoring-integration-wrapper.tsx
@@ -1,5 +1,6 @@
 /* eslint-disable react/no-multi-comp */
 /* eslint-disable no-case-declarations */
+/* eslint-disable react/display-name */
 import React from 'react';
 import {
     IArticle,
@@ -70,11 +71,9 @@ const getAuthoringCosmeticActions = (exposed: IExposedFromAuthoring<IArticle>):
     ),
     group: 'end',
     priority: 1,
-    keyBindings: {
-        'ctrl+shift+i': () => {
-            exposed.printPreview();
-        }
-    },
+    keyBindings: {'ctrl+shift+i': () => {
+        exposed.printPreview();
+    }},
 },
 {
     availableOffline: true,
@@ -89,11 +88,9 @@ const getAuthoringCosmeticActions = (exposed: IExposedFromAuthoring<IArticle>):
     ),
     group: 'end',
     priority: 2,
-    keyBindings: {
-        'ctrl+shift+t': () => {
-            exposed.toggleTheme();
-        }
-    }
+    keyBindings: {'ctrl+shift+t': () => {
+        exposed.toggleTheme();
+    }},
 },
 {
     availableOffline: true,
@@ -108,11 +105,9 @@ const getAuthoringCosmeticActions = (exposed: IExposedFromAuthoring<IArticle>):
     ),
     group: 'end',
     priority: 3,
-    keyBindings: {
-        'ctrl+shift+c': () => {
-            exposed.configureTheme();
-        }
-    },
+    keyBindings: {'ctrl+shift+c': () => {
+        exposed.configureTheme();
+    }},
 }];
 
 export type ISideWidget = {
@@ -433,7 +428,7 @@ export class AuthoringIntegrationWrapper extends React.PureComponent<IPropsWrapp
                                 availableOffline: false,
                                 group: 'start',
                                 priority: 1,
-                            }]
+                            }];
                         })}
                         getLanguage={(article) => article.language ?? 'en'}
                         onEditingStart={(article) => {

diff --git a/scripts/apps/authoring-react/authoring-react.tsx b/scripts/apps/authoring-react/authoring-react.tsx
@@ -1222,7 +1222,7 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
                     state.profile,
                     state.profile,
                     state.fieldsDataWithChanges,
-                )
+                );
             },
             configureTheme: () => {
                 this.showThemeConfigModal(state);
@@ -1373,9 +1373,10 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
         }
 
         const extraPrimaryToolbarWidgets = this.props.getAuthoringPrimaryToolbarWidgets?.(exposed) ?? [];
-        const secondaryToolbarWidgets = this.props.getSecondaryToolbarWidgets(exposed);
+        const secondaryToolbarWidgets = this.props.getSecondaryToolbarWidgets?.(exposed) ?? [];
 
         const allKeyBindings: IKeyBindings = {
+            ...getKeyBindingsFromActions(secondaryToolbarWidgets),
             ...getKeyBindingsFromActions(authoringOptions?.actions ?? []),
             ...keyBindingsFromAuthoringActions,
             ...widgetKeybindings,
@@ -1417,22 +1418,23 @@ export class AuthoringReact<T extends IBaseRestApiResponse> extends React.PureCo
                             <Layout.AuthoringFrame
                                 header={primaryToolbarWidgets.length < 1
                                     && extraPrimaryToolbarWidgets?.length < 1 ? null : (
-                                    <SubNav>
-                                        <AuthoringToolbar
-                                            entity={state.itemWithChanges}
-                                            coreWidgets={primaryToolbarWidgets}
-                                            extraWidgets={extraPrimaryToolbarWidgets}
-                                            backgroundColor={authoringOptions?.toolbarBgColor}
-                                        />
-                                    </SubNav>
-                                )}
+                                        <SubNav>
+                                            <AuthoringToolbar
+                                                entity={state.itemWithChanges}
+                                                coreWidgets={primaryToolbarWidgets}
+                                                extraWidgets={extraPrimaryToolbarWidgets}
+                                                backgroundColor={authoringOptions?.toolbarBgColor}
+                                            />
+                                        </SubNav>
+                                    )
+                                }
                                 main={(
                                     <Layout.AuthoringMain
                                         noPaddingForContent
                                         headerCollapsed={this.props.headerCollapsed}
                                         toolbarCustom
                                         toolBar={secondaryToolbarWidgets == null ? null : (
-                                            <SubNav className='px-2'>
+                                            <SubNav className="px-2">
                                                 <AuthoringToolbar
                                                     entity={state.itemWithChanges}
                                                     coreWidgets={secondaryToolbarWidgets}

diff --git a/scripts/apps/authoring/authoring/authoring-topbar2-react.tsx b/scripts/apps/authoring/authoring/authoring-topbar2-react.tsx
@@ -1,3 +1,5 @@
+/* eslint-disable react/no-multi-comp */
+/* eslint-disable react/display-name */
 import React from 'react';
 import {IArticle, IAuthoringActionType, ITopBarWidget} from 'superdesk-api';
 import {flatMap} from 'lodash';

diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts
@@ -200,7 +200,7 @@ declare module 'superdesk-api' {
         getInlineToolbarActions?(options: IExposedFromAuthoring<T>): IAuthoringOptions<T>;
 
         getAuthoringPrimaryToolbarWidgets?(options: IExposedFromAuthoring<T>): Array<ITopBarWidget<T>>;
-        getSecondaryToolbarWidgets: (exposed: IExposedFromAuthoring<T>) => Array<ITopBarWidget<T>>;
+        getSecondaryToolbarWidgets?: (exposed: IExposedFromAuthoring<T>) => Array<ITopBarWidget<T>>;
 
         onEditingStart?(item: T): void;
         onEditingEnd?(item: T): void;

diff --git a/scripts/extensions/broadcasting/src/rundown-templates/template-edit.tsx b/scripts/extensions/broadcasting/src/rundown-templates/template-edit.tsx
@@ -600,7 +600,6 @@ export class RundownTemplateViewEdit extends React.PureComponent<IProps, IState>
                                                 }}
                                                 getSideWidgetIdAtIndex={() => ''}
                                                 getAuthoringPrimaryToolbarWidgets={() => []}
-                                                secondaryToolbarWidgets={[]}
                                                 disableWidgetPinning
                                             />
                                         )

diff --git a/scripts/extensions/broadcasting/src/rundowns/rundown-view-edit.tsx b/scripts/extensions/broadcasting/src/rundowns/rundown-view-edit.tsx
@@ -665,7 +665,6 @@ export class RundownViewEditComponent extends React.PureComponent<IProps, IState
                                                     };
                                                 }}
                                                 getAuthoringPrimaryToolbarWidgets={() => []}
-                                                secondaryToolbarWidgets={[]}
                                                 getSidebarWidgetsCount={({item}) => {
                                                     return getAvailableSideWidgets(item).length;
                                                 }}