@atlaskit/link-datasource 1.15.1 → 1.15.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.15.3
+
+### Patch Changes
+
+- [#42661](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42661) [`c6abc68904d`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c6abc68904d) - [ux] Fix date showing incorrectly and also update test data to check for the format it was failing for
+
+## 1.15.2
+
+### Patch Changes
+
+- [#42738](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42738) [`95e6223ddb8`](https://bitbucket.org/atlassian/atlassian-frontend/commits/95e6223ddb8) - Add macro inserted analytics event for jlol smart link insertions
+
 ## 1.15.1
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.15.1"
+  packageVersion: "1.15.3"
 };

package/dist/cjs/ui/issue-like-table/render-type/date-time/index.js

@@ -32,8 +32,14 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
     testId = _ref$testId === void 0 ? DATETIME_TYPE_TEST_ID : _ref$testId,
     _ref$display = _ref.display,
     display = _ref$display === void 0 ? 'datetime' : _ref$display;
-  var date = new Date(value);
   var intl = (0, _reactIntlNext.useIntl)();
+  /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
+    to be one day off in some timezones. We want it to display the date without converting timezones and a solution
+   is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
+    See https://stackoverflow.com/a/31732581
+   */
+  var dateValue = /^\d{4}-\d{2}-\d{2}$/.exec(value) ? value.replace(/-/g, '/') : value;
+  var date = new Date(dateValue);
   if (!value || isNaN(date.getTime())) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   }

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -350,10 +350,28 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
       }),
       eventType: 'ui'
     });
+
+    // additional event for tracking in confluence against JIM
+    var macroInsertedEvent = analyticsEvent.clone();
+    macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.update({
+      eventType: 'track',
+      action: 'inserted',
+      actionSubject: 'macro',
+      actionSubjectId: 'jlol',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: getDisplayValue(currentViewMode, totalCount || 0),
+        searchCount: searchCount.current,
+        searchMethod: (0, _utils.mapSearchMethod)(searchMethodSearchedWith.current),
+        actions: Array.from(userInteractionActions.current)
+      })
+    });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(_analytics.EVENT_CHANNEL);
     var firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {
@@ -361,6 +379,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.15.1"
+  packageVersion: "1.15.3"
 };

package/dist/es2019/ui/issue-like-table/render-type/date-time/index.js

@@ -21,8 +21,14 @@ const DateTimeRenderType = ({
   testId = DATETIME_TYPE_TEST_ID,
   display = 'datetime'
 }) => {
-  const date = new Date(value);
   const intl = useIntl();
+  /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
+    to be one day off in some timezones. We want it to display the date without converting timezones and a solution
+   is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
+    See https://stackoverflow.com/a/31732581
+   */
+  const dateValue = /^\d{4}-\d{2}-\d{2}$/.exec(value) ? value.replace(/-/g, '/') : value;
+  const date = new Date(dateValue);
   if (!value || isNaN(date.getTime())) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -299,10 +299,29 @@ export const PlainJiraIssuesConfigModal = props => {
       },
       eventType: 'ui'
     });
+
+    // additional event for tracking in confluence against JIM
+    const macroInsertedEvent = analyticsEvent.clone();
+    macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.update({
+      eventType: 'track',
+      action: 'inserted',
+      actionSubject: 'macro',
+      actionSubjectId: 'jlol',
+      attributes: {
+        ...analyticsPayload,
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: getDisplayValue(currentViewMode, totalCount || 0),
+        searchCount: searchCount.current,
+        searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
+        actions: Array.from(userInteractionActions.current)
+      }
+    });
     const consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(EVENT_CHANNEL);
     const firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {
@@ -310,6 +329,7 @@ export const PlainJiraIssuesConfigModal = props => {
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.15.1"
+  packageVersion: "1.15.3"
 };

package/dist/esm/ui/issue-like-table/render-type/date-time/index.js

@@ -25,8 +25,14 @@ var DateTimeRenderType = function DateTimeRenderType(_ref) {
     testId = _ref$testId === void 0 ? DATETIME_TYPE_TEST_ID : _ref$testId,
     _ref$display = _ref.display,
     display = _ref$display === void 0 ? 'datetime' : _ref$display;
-  var date = new Date(value);
   var intl = useIntl();
+  /* In some cases we get a value of `2023-12-20` which when parsed by JS assumes meantime timezone, causing the date
+    to be one day off in some timezones. We want it to display the date without converting timezones and a solution
+   is to replace the hyphens with slashes. So it should be 20th Dec regardless of the timezone in this case.
+    See https://stackoverflow.com/a/31732581
+   */
+  var dateValue = /^\d{4}-\d{2}-\d{2}$/.exec(value) ? value.replace(/-/g, '/') : value;
+  var date = new Date(dateValue);
   if (!value || isNaN(date.getTime())) {
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   }

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -341,10 +341,28 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
       }),
       eventType: 'ui'
     });
+
+    // additional event for tracking in confluence against JIM
+    var macroInsertedEvent = analyticsEvent.clone();
+    macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.update({
+      eventType: 'track',
+      action: 'inserted',
+      actionSubject: 'macro',
+      actionSubjectId: 'jlol',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: getDisplayValue(currentViewMode, totalCount || 0),
+        searchCount: searchCount.current,
+        searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
+        actions: Array.from(userInteractionActions.current)
+      })
+    });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(EVENT_CHANNEL);
     var firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {
@@ -352,6 +370,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
         }
       }, consumerEvent);
     } else if (responseItems.length === 1 && firstIssueUrl) {
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
       onInsert({
         type: 'inlineCard',
         attrs: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.15.1",
+  "version": "1.15.3",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"