fix merge issues

superdesk · Oct 20, 2023 · 7f8a480 · 7f8a480
1 parent 44decac
commit 7f8a480
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/client/actions/agenda.ts b/client/actions/agenda.ts
@@ -3,12 +3,12 @@ import {cloneDeep, pick, get, sortBy, findIndex} from 'lodash';
 import {Moment} from 'moment';
 
 import {IEventItem, IPlanningItem, IAgenda} from '../interfaces';
+import {planningApi} from '../superdeskApi';
 
 import {AGENDA, MODALS, EVENTS} from '../constants';
 import {getErrorMessage, gettext, planningUtils} from '../utils';
 import {planning, showModal, main} from './index';
 import {convertStringFields} from '../utils/strings';
-import {planningApi} from "../superdeskApi";
 
 const openAgenda = () => (
     (dispatch) => (

diff --git a/client/api/planning.ts b/client/api/planning.ts
@@ -34,7 +34,7 @@ function convertPlanningParams(params: ISearchParams): Partial<ISearchAPIParams>
         g2_content_type: params.g2_content_type?.qcode,
         source: cvsToString(params.source, 'id'),
         coverage_user_id: params.coverage_user_id,
-        coverage_assignment_status: params.coverage_assignment_status
+        coverage_assignment_status: params.coverage_assignment_status,
         priority: arrayToString(params.priority),
     };
 }

diff --git a/client/utils/events.ts b/client/utils/events.ts
@@ -899,7 +899,11 @@ const isEventInRange = (
 /*
  * Groups the events by date
  */
-function getEventsByDate(events: Array<IEventItem>, startDate: moment.Moment, endDate: moment.Moment): Array<IEventItem> {
+function getEventsByDate(
+    events: Array<IEventItem>,
+    startDate: moment.Moment,
+    endDate: moment.Moment
+): Array<IEventItem> {
     if ((events?.length ?? 0) === 0) {
         return [];
     }