@atlaskit/link-datasource 1.20.0 → 1.22.0

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

@@ -30,6 +30,7 @@ var _ufoExperiences = require("../../../analytics/ufoExperiences");
 var _useColumnPickerRenderedFailedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience");
 var _useDataRenderedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience");
 var _utils = require("../../../analytics/utils");
+var _adf = require("../../../common/utils/adf");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
@@ -418,31 +419,25 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         }
       }, consumerEvent);
     } else {
-      onInsert({
-        type: 'blockCard',
-        attrs: {
-          url: upToDateJqlUrl,
-          datasource: {
-            id: datasourceId,
-            parameters: {
-              cloudId: cloudId,
-              jql: upToDateJql // TODO support non JQL type
-            },
+      onInsert((0, _adf.buildDatasourceAdf)({
+        id: datasourceId,
+        parameters: {
+          cloudId: cloudId,
+          jql: upToDateJql // TODO support non JQL type
+        },
 
-            views: [{
-              type: 'table',
-              properties: {
-                columns: visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.map(function (key) {
-                  return {
-                    key: key,
-                    width: columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key]
-                  };
-                })
-              }
-            }]
+        views: [{
+          type: 'table',
+          properties: {
+            columns: (visibleColumnKeys || []).map(function (key) {
+              return {
+                key: key,
+                width: columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key]
+              };
+            })
           }
-        }
-      }, consumerEvent);
+        }]
+      }, upToDateJqlUrl), consumerEvent);
     }
   }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, onInsert, datasourceId, cloudId, columnCustomSizes, searchBarJql, responseItems]);
   var handleViewModeChange = function handleViewModeChange(selectedMode) {

package/dist/es2019/common/utils/adf.js

@@ -0,0 +1,9 @@
+export const buildDatasourceAdf = (datasource, url) => {
+  return {
+    type: 'blockCard',
+    attrs: {
+      url,
+      datasource
+    }
+  };
+};

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -16,12 +16,14 @@ export const useDatasourceTableState = ({
   } = useErrorLogger();
   const idFieldCount = 1;
   const keyFieldCount = 1;
+  const [initialEmptyArray] = useState([]);
   const [defaultVisibleColumnKeys, setDefaultVisibleColumnKeys] = useState([]);
   const [lastRequestedFieldKeys, setLastRequestedFieldKeys] = useState([]);
   const [fullSchema, setFullSchema] = useState({
     properties: []
   });
   const [status, setStatus] = useState('empty');
+  const [authDetails, setAuthDetails] = useState([]);
   const [responseItems, setResponseItems] = useState([]);
   const [hasNextPage, setHasNextPage] = useState(true);
   const [nextCursor, setNextCursor] = useState(undefined);
@@ -41,7 +43,8 @@ export const useDatasourceTableState = ({
     try {
       const {
         meta: {
-          access
+          access,
+          auth
         },
         data: {
           schema
@@ -49,12 +52,9 @@ export const useDatasourceTableState = ({
       } = await getDatasourceDetails(datasourceId, {
         parameters
       });
-      if (access === 'unauthorized') {
-        setStatus('unauthorized');
-        return;
-      }
-      if (access === 'forbidden') {
-        setStatus('forbidden');
+      if (access === 'unauthorized' || access === 'forbidden') {
+        setStatus(access);
+        setAuthDetails(auth || initialEmptyArray);
         return;
       }
       const isColumnNotPresentInCurrentColumnsList = col => !columns.find(column => column.key === col.key);
@@ -73,7 +73,7 @@ export const useDatasourceTableState = ({
       }
       setStatus('rejected');
     }
-  }, [captureError, columns, datasourceId, getDatasourceDetails, parameters]);
+  }, [captureError, columns, datasourceId, getDatasourceDetails, parameters, initialEmptyArray]);
   const applySchemaProperties = useCallback((schema, fieldKeys) => {
     let {
       properties,
@@ -131,7 +131,8 @@ export const useDatasourceTableState = ({
         meta: {
           access,
           destinationObjectTypes,
-          extensionKey
+          extensionKey,
+          auth
         },
         data: {
           items,
@@ -140,12 +141,9 @@ export const useDatasourceTableState = ({
           schema
         }
       } = await getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-      if (access === 'unauthorized') {
-        setStatus('unauthorized');
-        return;
-      }
-      if (access === 'forbidden') {
-        setStatus('forbidden');
+      if (access === 'unauthorized' || access === 'forbidden') {
+        setStatus(access);
+        setAuthDetails(auth || initialEmptyArray);
         return;
       }
       setExtensionKey(extensionKey);
@@ -192,23 +190,26 @@ export const useDatasourceTableState = ({
       }
       setStatus('rejected');
     }
-  }, [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema]);
+  }, [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
   const reset = useCallback(options => {
-    setStatus('empty');
-    setResponseItems([]);
+    setResponseItems(initialEmptyArray);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);
-    setLastRequestedFieldKeys([]);
+    setLastRequestedFieldKeys(initialEmptyArray);
+    setAuthDetails(initialEmptyArray);
     setFullSchema({
-      properties: []
+      properties: initialEmptyArray
     });
     setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
     if (options !== null && options !== void 0 && options.shouldResetColumns) {
-      setColumns([]);
-      setDefaultVisibleColumnKeys([]);
+      setColumns(initialEmptyArray);
+      setDefaultVisibleColumnKeys(initialEmptyArray);
     }
-  }, []);
+
+    // setting the status earlier is triggering useEffects without all reset state values, hence placing this as the last state reset item
+    setStatus('empty');
+  }, [initialEmptyArray]);
 
   // this takes care of requesting /data initially
   useEffect(() => {
@@ -255,6 +256,7 @@ export const useDatasourceTableState = ({
     defaultVisibleColumnKeys,
     totalCount,
     extensionKey,
-    destinationObjectTypes
+    destinationObjectTypes,
+    authDetails
   };
 };

package/dist/es2019/index.js

@@ -2,6 +2,7 @@ export { default as JiraIssuesConfigModal } from './ui/jira-issues-modal';
 export { default as AssetsConfigModal } from './ui/assets-modal';
 export { default as DatasourceTableView } from './ui/datasource-table-view';
 export { default as JSMAssetsConfigModal } from './ui/assets-modal';
+export { buildDatasourceAdf } from './common/utils/adf';
 export { JIRA_LIST_OF_LINKS_DATASOURCE_ID } from './ui/jira-issues-modal';
 export { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from './ui/assets-modal';
 export { LazyLoadedDatasourceRenderFailedAnalyticsWrapper } from './analytics/wrappers/render-failed';

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -14,6 +14,7 @@ import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../
 import { startUfoExperience } from '../../../analytics/ufoExperiences';
 import { useColumnPickerRenderedFailedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
 import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
+import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useAssetsClient } from '../../../hooks/useAssetsClient';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
@@ -227,27 +228,22 @@ const PlainAssetsConfigModal = props => {
         }
       }, consumerEvent);
     } else {
-      onInsert({
-        type: 'blockCard',
-        attrs: {
-          datasource: {
-            id: datasourceId,
-            parameters: {
-              workspaceId,
-              aql,
-              schemaId
-            },
-            views: [{
-              type: 'table',
-              properties: {
-                columns: visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.map(key => ({
-                  key
-                }))
-              }
-            }]
+      onInsert(buildDatasourceAdf({
+        id: datasourceId,
+        parameters: {
+          workspaceId,
+          aql,
+          schemaId
+        },
+        views: [{
+          type: 'table',
+          properties: {
+            columns: (visibleColumnKeys !== null && visibleColumnKeys !== void 0 ? visibleColumnKeys : []).map(key => ({
+              key
+            }))
           }
-        }
-      }, consumerEvent);
+        }]
+      }), consumerEvent);
     }
   }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
   const onCancelClick = useCallback((e, analyticEvent) => {

package/dist/es2019/ui/common/error-state/messages.js

@@ -54,5 +54,25 @@ export const loadingErrorMessages = defineMessages({
     id: 'linkDataSource.jira-issues.no.jira.sites.access.description',
     description: 'Description that shows in the modal when user has no access to any Jira sites',
     defaultMessage: 'To request access, contact your admin.'
+  },
+  authScreenHeaderText: {
+    id: 'linkDataSource.datasource.table.authScreenHeaderText',
+    defaultMessage: 'Connect your account',
+    description: 'Header text to be displayed in the auth screen UI.'
+  },
+  authScreenDescriptionText: {
+    id: 'linkDataSource.datasource.table.authScreenDescriptionText',
+    defaultMessage: 'Connect your account to collaborate on work across Atlassian products.',
+    description: 'Description text to be displayed in the auth screen UI.'
+  },
+  learnMoreAboutSmartLinks: {
+    id: 'linkDataSource.datasource.table.learnMoreAboutSmartLinks',
+    defaultMessage: 'Learn more about Smart Links.',
+    description: 'An anchor link to redirect user to a page about Smart Links.'
+  },
+  authConnectButtonText: {
+    id: 'linkDataSource.datasource.table.authConnectButtonText',
+    defaultMessage: 'Connect',
+    description: 'Label for the authentication button.'
   }
 });