Datetime field imrpovements (superdesk#4732)

tomaskikutis · Jan 23, 2025 · a55623a · a55623a
1 parent f3a916e
commit a55623a
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 47 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -124,7 +124,7 @@
     "sass-loader": "6.0.6",
     "shortid": "2.2.8",
     "style-loader": "0.20.2",
-    "superdesk-ui-framework": "4.0.4",
+    "superdesk-ui-framework": "4.0.11",
     "ts-loader": "3.5.0",
     "typescript": "4.9.5",
     "uuid": "8.3.1",
@@ -168,5 +168,8 @@
     "lint-fix": "eslint --fix --parser=@typescript-eslint/parser --ext .js --ext .jsx --ext .ts --ext .tsx scripts e2e/client tasks",
     "server": "grunt server",
     "dev": "npm run server"
+  },
+  "volta": {
+    "node": "14.21.3"
   }
 }
diff --git a/scripts/apps/authoring-react/fields/datetime/difference.tsx b/scripts/apps/authoring-react/fields/datetime/difference.tsx
@@ -12,7 +12,7 @@ export class Difference extends React.PureComponent<IProps> {
             <DifferenceGeneric
                 items1={value1 == null ? [] : [value1]}
                 items2={value2 == null ? [] : [value2]}
-                getId={(item) => item}
+                getId={(item) => item.getDate().toString()}
                 template={({item}) => <span>{item}</span>}
             />
         );

diff --git a/scripts/apps/authoring-react/fields/datetime/editor.tsx b/scripts/apps/authoring-react/fields/datetime/editor.tsx
@@ -23,15 +23,8 @@ export class Editor extends React.PureComponent<IProps> {
                         text: gettext('Date time'),
                         hidden: true,
                     }}
-                    onChange={(value) => {
-                        this.props.onChange(value);
-                    }}
-                    value={(() => {
-                        const {value} = this.props;
-                        const parsedVal = value != null && (value.length > 0) ? new Date(value) : null;
-
-                        return parsedVal;
-                    })()}
+                    onChange={this.props.onChange}
+                    value={this.props.value}
                     disabled={this.props.config.readOnly}
                     width={this.props.config.width}
                 />

diff --git a/scripts/apps/authoring-react/fields/datetime/preview.tsx b/scripts/apps/authoring-react/fields/datetime/preview.tsx
@@ -14,12 +14,7 @@ export class Preview extends React.PureComponent<IProps> {
                 label={gettext('Date time (AUTHORING-REACT)')}
                 onChange={noop}
                 preview={true}
-                value={(() => {
-                    const {value} = this.props;
-                    const parsedVal = value != null && (value.length > 0) ? new Date(value) : null;
-
-                    return parsedVal;
-                })()}
+                value={this.props.value}
                 disabled={this.props.config.readOnly}
                 width={this.props.config.width}
             />

diff --git a/scripts/core/superdesk-api.d.ts b/scripts/core/superdesk-api.d.ts
@@ -325,7 +325,7 @@ declare module 'superdesk-api' {
 
     // AUTHORING-REACT FIELD TYPES - datetime
 
-    export type IDateTimeValueOperational = string; // ISO 8601, 13:59:01.123
+    export type IDateTimeValueOperational = Date | null;
     export type IDateTimeValueStorage = IDateTimeValueOperational;
     export interface IDateTimeFieldConfig extends ICommonFieldConfig {
         allowSeconds?: boolean;