Fix lint

superdesk · Aug 16, 2024 · fcde41c · fcde41c
1 parent 79fbacb
commit fcde41c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/scripts/apps/users/directives/UserPreferencesDirective.ts b/scripts/apps/users/directives/UserPreferencesDirective.ts
@@ -5,7 +5,7 @@ import {appConfig, extensions, getUserInterfaceLanguage} from 'appConfig';
 import {applyDefault} from 'core/helpers/typescript-helpers';
 import {DEFAULT_EDITOR_THEME} from 'apps/authoring/authoring/services/AuthoringThemesService';
 import {cloneDeep, pick} from 'lodash';
-import {IExtensionActivationResult} from 'superdesk-api';
+import {IExtensionActivationResult, IMultiChannelNotification} from 'superdesk-api';
 
 /**
  * @ngdoc directive
@@ -391,7 +391,10 @@ export function UserPreferencesDirective(
                     scope.preferences[NOTIFICATIONS_KEY] = {};
                 }
 
-                for (const [notificationId, notification] of Object.entries(registeredNotifications)) {
+                for (
+                    const [notificationId, notification]
+                    of Object.entries(registeredNotifications) as Array<[string, IMultiChannelNotification]>
+                ) {
                     if (scope.preferences[NOTIFICATIONS_KEY][notificationId] == null) {
                         scope.preferences[NOTIFICATIONS_KEY][notificationId] = {
                             email: true,

diff --git a/scripts/core/menu/notifications/notifications.ts b/scripts/core/menu/notifications/notifications.ts
@@ -4,7 +4,7 @@ import _ from 'lodash';
 import {gettext} from 'core/utils';
 import {AuthoringWorkspaceService} from 'apps/authoring/authoring/services/AuthoringWorkspaceService';
 import {extensions} from 'appConfig';
-import {IExtensionActivationResult} from 'superdesk-api';
+import {IMultiChannelNotification} from 'superdesk-api';
 import {logger} from 'core/services/logger';
 import emptyState from 'superdesk-ui-framework/dist/empty-state--small-2.svg';
 
@@ -296,12 +296,12 @@ angular.module('superdesk.core.menu.notifications', ['superdesk.core.services.as
                     scope.emptyState = emptyState;
 
                     // merged from all extensions
-                    const notificationsKeyed: {
-                        [key: string]: IExtensionActivationResult['contributions']['notifications'][0]['handler']
-                    } = {};
+                    const notificationsKeyed: {[key: string]: IMultiChannelNotification['handler']} = {};
 
                     for (const extension of Object.values(extensions)) {
-                        const notificationsFromExtensions = extension.activationResult.contributions?.notifications;
+                        const notificationsFromExtensions = extension
+                            .activationResult
+                            .contributions?.notifications as {[key: string]: IMultiChannelNotification};
 
                         if (notificationsFromExtensions != null) {
                             for (const key in notificationsFromExtensions) {

diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts
@@ -706,16 +706,14 @@ declare module 'superdesk-api' {
     }
 
     /**
-     * @deprecated This interface is deprecated and will be removed in future versions.
-     * Use the `name, handler` one
+     * @deprecated This interface is deprecated and will be removed in future versions. Use IMultiChannelNotification
      */
     interface IEmailNotification {
         type: 'email';
     }
 
     /**
-     * @deprecated This interface is deprecated and will be removed in future versions.
-     * Use the `name, handler` one
+     * @deprecated This interface is deprecated and will be removed in future versions. Use IMultiChannelNotification
      */
     interface IDesktopNotification {
         type: 'desktop';
@@ -726,6 +724,14 @@ declare module 'superdesk-api' {
         };
     }
 
+    interface IMultiChannelNotification {
+        name: string;
+        handler?: (notification: any) => {
+            body: string;
+            actions: Array<{label: string; onClick: () => void;}>;
+        };
+    }
+
     export interface IExtensionActivationResult {
         contributions?: {
             globalMenuHorizontal?: Array<React.ComponentType>;
@@ -764,13 +770,7 @@ declare module 'superdesk-api' {
             workspaceMenuItems?: Array<IWorkspaceMenuItem>;
             customFieldTypes?: Array<ICustomFieldType>;
             notifications?: {
-                [id: string]: IDesktopNotification | IEmailNotification | {
-                    name: string;
-                    handler?: (notification: any) => {
-                        body: string;
-                        actions: Array<{label: string; onClick: () => void;}>;
-                    };
-                };
+                [id: string]: IDesktopNotification | IEmailNotification | IMultiChannelNotification;
             };
             entities?: {
                 article?: {