remove longFormatDate

dzonidoo · Aug 1, 2024 · 336a8fb · 336a8fb
1 parent 8f1f3fd
commit 336a8fb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 24 deletions.
diff --git a/scripts/appConfig.ts b/scripts/appConfig.ts
@@ -20,6 +20,10 @@ if (appConfig.view.timeformat == null) {
     appConfig.view.timeformat = 'hh:mm'; // 24h format
 }
 
+if (appConfig.longDateFormat == null) {
+    appConfig.longDateFormat = 'LLL';
+}
+
 if (appConfig.ui == null) {
     appConfig.ui = {};
 

diff --git a/scripts/core/datetime/datetime.ts b/scripts/core/datetime/datetime.ts
@@ -3,7 +3,7 @@ import {gettext} from 'core/utils';
 import moment from 'moment-timezone';
 import {appConfig} from 'appConfig';
 import {IArticle} from 'superdesk-api';
-import {formatDate, longFormatDate} from 'core/get-superdesk-api-implementation';
+import {formatDate} from 'core/get-superdesk-api-implementation';
 
 const ISO_DATE_FORMAT = 'YYYY-MM-DD';
 const ISO_WEEK_FORMAT = 'YYYY-W';
@@ -136,7 +136,7 @@ export function scheduledFormat(__item: IArticle): {short: string, long: string}
 
     return {
         short: short,
-        long: longFormatDate(datetime.moment),
+        long: formatDate(datetime.moment, {longFormat: true}),
     };
 }
 

diff --git a/scripts/core/get-superdesk-api-implementation.tsx b/scripts/core/get-superdesk-api-implementation.tsx
@@ -220,20 +220,24 @@ export function isArticleLockedInCurrentSession(article: IArticle): boolean {
     return ng.get('lock').isLockedInCurrentSession(article);
 }
 
-export const formatDate = (date: Date | string | moment.Moment, timezoneId?: string): string => {
+export const formatDate = (
+    date: Date | string | moment.Moment,
+    options?: {timezoneId?: string; longFormat?:boolean},
+): string => {
     const momentDate = moment.isMoment(date) === true ? date as moment.Moment : moment(date);
+    const dateFormat = options.longFormat === true ? appConfig.longDateFormat : appConfig.view.dateformat;
 
-    if (timezoneId != null) {
+    if (options.timezoneId != null) {
         return momentDate
-            .tz(timezoneId)
-            .format(appConfig.view.dateformat);
+            .tz(options.timezoneId)
+            .format(dateFormat);
     } else {
         const timezone: 'browser' | 'server' = appConfig.view.timezone ?? 'browser';
         const keepLocalTime = timezone === 'browser';
 
         return momentDate
             .tz(appConfig.default_timezone, keepLocalTime)
-            .format(appConfig.view.dateformat);
+            .format(dateFormat);
     }
 };
 
@@ -252,23 +256,6 @@ export const formatDateTime = (date: Date, timezoneId?: string) => {
     }
 };
 
-export const longFormatDate = (date: Date | string | moment.Moment, timezoneId?: string): string => {
-    const momentDate = moment.isMoment(date) === true ? date as moment.Moment : moment(date);
-
-    if (timezoneId != null) {
-        return momentDate
-            .tz(timezoneId)
-            .format(appConfig.view.dateformat + ' ' + appConfig.view.timeformat);
-    } else {
-        const timezone: 'browser' | 'server' = appConfig.view.timezone ?? 'browser';
-        const keepLocalTime = timezone === 'browser';
-
-        return momentDate
-            .tz(appConfig.default_timezone, keepLocalTime)
-            .format(appConfig.longDateFormat || 'LLL');
-    }
-};
-
 export function dateToServerString(date: Date) {
     return date.toISOString().slice(0, 19) + '+0000';
 }