decouple datetime component from angular service (superdesk#4729)

tomaskikutis · Jan 21, 2025 · f3a916e · f3a916e
1 parent 2e1f329
commit f3a916e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 27 deletions.
diff --git a/scripts/core/datetime/datetime.ts b/scripts/core/datetime/datetime.ts
@@ -137,32 +137,36 @@ export function scheduledFormat(__item: IArticle): {short: string, long: string}
     };
 }
 
+/**
+ * Get short representation of given datetime
+ *
+ * It returns time for current day, day + time for current week, date otherwise.
+ *
+ * @param {String} d iso format datetime
+ * @return {String}
+ */
+export function shortFormat(d) {
+    var m = moment(d);
+    var now = moment();
+
+    if (isSameDay(m, now)) {
+        return m.format(TIME_FORMAT);
+    } else if (isSameWeek(m, now)) {
+        return m.format(WEEK_FORMAT);
+    } else if (isArchiveYear(m, now)) {
+        return m.format(ARCHIVE_FORMAT);
+    }
+
+    return m.format(DATE_FORMAT);
+}
+
+export const longFormat = (date) => formatDate(date, {longFormat: true});
+
 DateTimeService.$inject = [];
 function DateTimeService() {
-    /**
-     * Get short representation of given datetime
-     *
-     * It returns time for current day, day + time for current week, date otherwise.
-     *
-     * @param {String} d iso format datetime
-     * @return {String}
-     */
-    this.shortFormat = function(d) {
-        var m = moment(d);
-        var now = moment();
-
-        if (isSameDay(m, now)) {
-            return m.format(TIME_FORMAT);
-        } else if (isSameWeek(m, now)) {
-            return m.format(WEEK_FORMAT);
-        } else if (isArchiveYear(m, now)) {
-            return m.format(ARCHIVE_FORMAT);
-        }
-
-        return m.format(DATE_FORMAT);
-    };
+    this.shortFormat = shortFormat;
 
-    this.longFormat = (date) => formatDate(date, {longFormat: true});
+    this.longFormat = longFormat;
 }
 
 DateTimeHelperService.$inject = [];

diff --git a/scripts/core/ui/components/DateTime.tsx b/scripts/core/ui/components/DateTime.tsx
@@ -1,14 +1,13 @@
 import React from 'react';
-import ng from 'core/services/ng';
 import {IPropsDateTime} from 'superdesk-api';
+import {longFormat, shortFormat} from 'core/datetime/datetime';
 
 export class DateTime extends React.PureComponent<IPropsDateTime> {
     render() {
-        const datetimeService = ng.get('datetime');
         const {dateTime} = this.props;
 
-        const dateShort = datetimeService.shortFormat(dateTime);
-        const dateLong = datetimeService.longFormat(dateTime);
+        const dateShort = shortFormat(dateTime);
+        const dateLong = longFormat(dateTime);
         const tooltip = this.props.tooltip == null ? dateLong : this.props.tooltip(dateLong, dateShort);
 
         return (