Merge branch 'tz-upgrade-dateformat' into 'master'

Updates dateformat to newer version

See merge request gitlab-org/gitlab!63419

app/assets/javascripts/lib/utils/datetime_range.js

@@ -26,14 +26,7 @@ const isValidDateString = (dateString) => {
     return false;
   }
 
-  try {
-    // dateformat throws error that can be caught.
-    // This is better than using `new Date()`
-    dateformat(dateString, 'isoUtcDateTime');
-    return true;
-  } catch (e) {
-    return false;
-  }
+  return !Number.isNaN(Date.parse(dateformat(dateString, 'isoUtcDateTime')));
 };
 
 const handleRangeDirection = ({ direction = DEFAULT_DIRECTION, anchorDate, minDate, maxDate }) => {

app/assets/javascripts/lib/utils/datetime_utility.js

@@ -106,7 +106,7 @@ export function formatDateAsMonth(datetime, options = {}) {
 
 /**
  * @example
- * dateFormat('2017-12-05','mmm d, yyyy h:MMtt Z' ) -> "Dec 5, 2017 12:00am GMT+0000"
+ * dateFormat('2017-12-05','mmm d, yyyy h:MMtt Z' ) -> "Dec 5, 2017 12:00am UTC"
  * @param {date} datetime
  * @param {String} format
  * @param {Boolean} UTC convert local time to UTC

ee/spec/frontend/geo_replicable/components/__snapshots__/geo_replicable_time_ago_spec.js.snap

 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`GeoReplicableTimeAgo template when dateString exists TimeAgo sets innerHTML as 09-23-1994 1`] = `"<time title=\\"Sep 23, 1994 12:00am GMT+0000\\" datetime=\\"09-23-1994\\" class=\\"\\">25 years ago</time>"`;
+exports[`GeoReplicableTimeAgo template when dateString exists TimeAgo sets innerHTML as 09-23-1994 1`] = `"<time title=\\"Sep 23, 1994 12:00am UTC\\" datetime=\\"09-23-1994\\" class=\\"\\">25 years ago</time>"`;
 
 exports[`GeoReplicableTimeAgo template when dateString is null DefaultText sets innerHTML as props.defaultText 1`] = `"<span>Default Text</span>"`;

ee/spec/frontend/requirements/components/requirement_item_spec.js

@@ -101,7 +101,7 @@ describe('RequirementItem', () => {
 
       expect(createdAtEl.text()).toContain('created');
       expect(createdAtEl.text()).toContain('ago');
-      expect(createdAtEl.attributes('title')).toBe('Mar 19, 2020 8:09am GMT+0000');
+      expect(createdAtEl.attributes('title')).toBe('Mar 19, 2020 8:09am UTC');
     });
 
     it('renders element containing requirement author information', () => {
@@ -116,7 +116,7 @@ describe('RequirementItem', () => {
 
       expect(updatedAtEl.text()).toContain('updated');
       expect(updatedAtEl.text()).toContain('ago');
-      expect(updatedAtEl.attributes('title')).toBe('Mar 20, 2020 8:09am GMT+0000');
+      expect(updatedAtEl.attributes('title')).toBe('Mar 20, 2020 8:09am UTC');
     });
 
     it('renders requirement-status-badge component', () => {

ee/spec/frontend/requirements/components/requirement_status_badge_spec.js

@@ -105,7 +105,7 @@ describe('RequirementStatusBadge', () => {
 
           expect(tooltipEl.exists()).toBe(true);
           expect(tooltipEl.find('b').text()).toBe(badgeProps.tooltipTitle);
-          expect(tooltipEl.find('div').text()).toBe('Jun 4, 2020 10:55am GMT+0000');
+          expect(tooltipEl.find('div').text()).toBe('Jun 4, 2020 10:55am UTC');
         });
       });
     });

ee/spec/frontend/security_dashboard/components/vulnerability_list_spec.js

@@ -303,7 +303,7 @@ describe('Vulnerability list component', () => {
       const { id } = newVulnerabilities[1];
       const cell = findDataCell(`detected-${id}`);
       expect(cell.text()).toEqual(`2020-07-22`);
-      expect(cell.attributes('title')).toEqual('Jul 22, 2020 7:31pm GMT+0000');
+      expect(cell.attributes('title')).toEqual('Jul 22, 2020 7:31pm UTC');
     });
 
     it('should display the vulnerability locations for code', () => {

package.json

@@ -114,7 +114,7 @@
     "d3-sankey": "^0.12.3",
     "d3-scale": "^2.2.2",
     "d3-selection": "^1.2.0",
-    "dateformat": "^3.0.3",
+    "dateformat": "^4.5.1",
     "deckar01-task_list": "^2.3.1",
     "diff": "^3.4.0",
     "document-register-element": "1.14.3",

spec/frontend/issuable_list/components/issuable_item_spec.js

@@ -336,7 +336,7 @@ describe('IssuableItem', () => {
       const createdAtEl = wrapper.find('[data-testid="issuable-created-at"]');
 
       expect(createdAtEl.exists()).toBe(true);
-      expect(createdAtEl.attributes('title')).toBe('Jun 29, 2020 1:52pm GMT+0000');
+      expect(createdAtEl.attributes('title')).toBe('Jun 29, 2020 1:52pm UTC');
       expect(createdAtEl.text()).toBe(wrapper.vm.createdAt);
     });
 
@@ -450,7 +450,7 @@ describe('IssuableItem', () => {
       const updatedAtEl = wrapper.find('[data-testid="issuable-updated-at"]');
 
       expect(updatedAtEl.exists()).toBe(true);
-      expect(updatedAtEl.find('span').attributes('title')).toBe('Sep 10, 2020 11:41am GMT+0000');
+      expect(updatedAtEl.find('span').attributes('title')).toBe('Sep 10, 2020 11:41am UTC');
       expect(updatedAtEl.text()).toBe(wrapper.vm.updatedAt);
     });
 

spec/frontend/jira_import/components/jira_import_progress_spec.js

@@ -64,7 +64,7 @@ describe('JiraImportProgress', () => {
     });
 
     it('shows the time of import', () => {
-      expect(getParagraphText()).toContain('Time of import: Apr 8, 2020 12:17pm GMT+0000');
+      expect(getParagraphText()).toContain('Time of import: Apr 8, 2020 12:17pm UTC');
     });
 
     it('shows the project key of the import', () => {

spec/frontend/lib/utils/datetime_utility_spec.js

@@ -101,13 +101,13 @@ describe('Date time utils', () => {
     it('should format date properly', () => {
       const formattedDate = datetimeUtility.formatDate(new Date('07/23/2016'));
 
-      expect(formattedDate).toBe('Jul 23, 2016 12:00am GMT+0000');
+      expect(formattedDate).toBe('Jul 23, 2016 12:00am UTC');
     });
 
     it('should format ISO date properly', () => {
       const formattedDate = datetimeUtility.formatDate('2016-07-23T00:00:00.559Z');
 
-      expect(formattedDate).toBe('Jul 23, 2016 12:00am GMT+0000');
+      expect(formattedDate).toBe('Jul 23, 2016 12:00am UTC');
     });
 
     it('should throw an error if date is invalid', () => {
@@ -878,7 +878,7 @@ describe('localTimeAgo', () => {
   it.each`
     timeagoArg | title
     ${false}   | ${'some time'}
-    ${true}    | ${'Feb 18, 2020 10:22pm GMT+0000'}
+    ${true}    | ${'Feb 18, 2020 10:22pm UTC'}
   `('converts $seconds seconds to $approximation', ({ timeagoArg, title }) => {
     const element = document.querySelector('time');
     datetimeUtility.localTimeAgo($(element), timeagoArg);

spec/frontend/members/components/table/expires_at_spec.js

@@ -54,7 +54,7 @@ describe('ExpiresAt', () => {
       const tooltipDirective = getTooltipDirective(expiredText);
 
       expect(tooltipDirective).not.toBeUndefined();
-      expect(expiredText.attributes('title')).toBe('Mar 15, 2019 12:00am GMT+0000');
+      expect(expiredText.attributes('title')).toBe('Mar 15, 2019 12:00am UTC');
     });
   });
 

spec/frontend/monitoring/components/charts/time_series_spec.js

@@ -208,7 +208,7 @@ describe('Time series component', () => {
             });
 
             it('formats tooltip title', () => {
-              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
+              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
             });
 
             it('formats tooltip content', () => {
@@ -282,7 +282,7 @@ describe('Time series component', () => {
             });
 
             it('formats tooltip title', () => {
-              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
+              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
             });
 
             it('formats tooltip sha', () => {
@@ -301,7 +301,7 @@ describe('Time series component', () => {
             });
 
             it('formats tooltip title', () => {
-              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (GMT+0000)');
+              expect(wrapper.vm.tooltip.title).toBe('16 Jul 2019, 10:14AM (UTC)');
             });
 
             it('formats tooltip sha', () => {
@@ -334,7 +334,7 @@ describe('Time series component', () => {
 
           it('formats tooltip title and sets tooltip content', () => {
             const formattedTooltipData = wrapper.vm.formatAnnotationsTooltipText(mockMarkPoint);
-            expect(formattedTooltipData.title).toBe('19 Feb 2020, 10:01AM (GMT+0000)');
+            expect(formattedTooltipData.title).toBe('19 Feb 2020, 10:01AM (UTC)');
             expect(formattedTooltipData.content).toBe(annotationsMetadata.tooltipData.content);
           });
         });

spec/frontend/registry/explorer/components/details_page/tags_list_row_spec.js

@@ -313,10 +313,10 @@ describe('tags list row', () => {
       });
 
       describe.each`
-        name                       | finderFunction             | text                                                                                                      | icon            | clipboard
-        ${'published date detail'} | ${findPublishedDateDetail} | ${'Published to the gitlab-org/gitlab-test/rails-12009 image repository at 01:29 GMT+0000 on 2020-11-03'} | ${'clock'}      | ${false}
-        ${'manifest detail'}       | ${findManifestDetail}      | ${'Manifest digest: sha256:2cf3d2fdac1b04a14301d47d51cb88dcd26714c74f91440eeee99ce399089062'}             | ${'log'}        | ${true}
-        ${'configuration detail'}  | ${findConfigurationDetail} | ${'Configuration digest: sha256:c2613843ab33aabf847965442b13a8b55a56ae28837ce182627c0716eb08c02b'}        | ${'cloud-gear'} | ${true}
+        name                       | finderFunction             | text                                                                                                 | icon            | clipboard
+        ${'published date detail'} | ${findPublishedDateDetail} | ${'Published to the gitlab-org/gitlab-test/rails-12009 image repository at 01:29 UTC on 2020-11-03'} | ${'clock'}      | ${false}
+        ${'manifest detail'}       | ${findManifestDetail}      | ${'Manifest digest: sha256:2cf3d2fdac1b04a14301d47d51cb88dcd26714c74f91440eeee99ce399089062'}        | ${'log'}        | ${true}
+        ${'configuration detail'}  | ${findConfigurationDetail} | ${'Configuration digest: sha256:c2613843ab33aabf847965442b13a8b55a56ae28837ce182627c0716eb08c02b'}   | ${'cloud-gear'} | ${true}
       `('$name details row', ({ finderFunction, text, icon, clipboard }) => {
         it(`has ${text} as text`, async () => {
           mountComponent();

spec/frontend/user_lists/components/user_lists_table_spec.js

@@ -35,7 +35,7 @@ describe('User Lists Table', () => {
 
   it('should set the title for a tooltip on the created stamp', () => {
     expect(wrapper.find('[data-testid="ffUserListTimestamp"]').attributes('title')).toBe(
-      'Feb 4, 2020 8:13am GMT+0000',
+      'Feb 4, 2020 8:13am UTC',
     );
   });
 

spec/frontend/vue_mr_widget/components/mr_widget_pipeline_spec.js

@@ -94,7 +94,7 @@ describe('MRWidgetPipeline', () => {
 
     it('should render pipeline finished timestamp', () => {
       expect(findPipelineFinishedAt().attributes()).toMatchObject({
-        title: 'Apr 7, 2017 2:00pm GMT+0000',
+        title: 'Apr 7, 2017 2:00pm UTC',
         datetime: mockData.pipeline.details.finished_at,
       });
     });

spec/frontend/vue_mr_widget/components/states/mr_widget_closed_spec.js

@@ -18,8 +18,8 @@ describe('MRWidgetClosed', () => {
             avatarUrl:
               'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
           },
-          mergedAt: 'Jan 24, 2018 1:02pm GMT+0000',
-          closedAt: 'Jan 24, 2018 1:02pm GMT+0000',
+          mergedAt: 'Jan 24, 2018 1:02pm UTC',
+          closedAt: 'Jan 24, 2018 1:02pm UTC',
           readableMergedAt: '',
           readableClosedAt: 'less than a minute ago',
         },

spec/frontend/vue_mr_widget/components/states/mr_widget_merged_spec.js

@@ -37,10 +37,10 @@ describe('MRWidgetMerged', () => {
           avatarUrl:
             'http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
         },
-        mergedAt: 'Jan 24, 2018 1:02pm GMT+0000',
+        mergedAt: 'Jan 24, 2018 1:02pm UTC',
         readableMergedAt: '',
         closedBy: {},
-        closedAt: 'Jan 24, 2018 1:02pm GMT+0000',
+        closedAt: 'Jan 24, 2018 1:02pm UTC',
         readableClosedAt: '',
       },
       updatedAt: 'mergedUpdatedAt',
@@ -236,6 +236,6 @@ describe('MRWidgetMerged', () => {
   });
 
   it('should use mergedEvent mergedAt as tooltip title', () => {
-    expect(vm.$el.querySelector('time').getAttribute('title')).toBe('Jan 24, 2018 1:02pm GMT+0000');
+    expect(vm.$el.querySelector('time').getAttribute('title')).toBe('Jan 24, 2018 1:02pm UTC');
   });
 });

yarn.lock

@@ -4169,10 +4169,10 @@ date-now@^0.1.4:
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
   integrity sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=
 
-dateformat@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
+dateformat@^4.5.1:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.5.1.tgz#c20e7a9ca77d147906b6dc2261a8be0a5bd2173c"
+  integrity sha512-OD0TZ+B7yP7ZgpJf5K2DIbj3FZvFvxgFUuaqA/V5zTjAtAAXZ1E8bktHxmAGs4x5b7PflqA9LeQ84Og7wYtF7Q==
 
 de-indent@^1.0.2:
   version "1.0.2"