@atlaskit/link-datasource 2.8.0 → 2.9.1

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

@@ -12,7 +12,7 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -27,6 +27,7 @@ import { useAssetsClient } from '../../../hooks/useAssetsClient';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { PermissionError } from '../../../services/cmdbService.utils';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { CancelButton } from '../../common/modal/cancel-button';
@@ -54,7 +55,9 @@ const PlainAssetsConfigModal = props => {
   const [aql, setAql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql);
   const [schemaId, setSchemaId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
   const apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  const [visibleColumnKeys, setVisibleColumnKeys] = useState(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
+  const [visibleColumnKeys, setVisibleColumnKeys] = useState(
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
   const [isNewSearch, setIsNewSearch] = useState(false);
   const [errorState, setErrorState] = useState();
   const {
@@ -105,7 +108,7 @@ const PlainAssetsConfigModal = props => {
     aql: aql || '',
     schemaId: schemaId || '',
     workspaceId: workspaceId || '',
-    ...(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+    ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
       version: VERSION_TWO
     } : {})
   }), [aql, schemaId, workspaceId]);
@@ -190,7 +193,7 @@ const PlainAssetsConfigModal = props => {
     setIsNewSearch(false);
   }, []);
   useEffect(() => {
-    if (getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter')) {
+    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
       const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
       setVisibleColumnKeys(newVisibleColumnKeys);
     } else {
@@ -249,7 +252,7 @@ const PlainAssetsConfigModal = props => {
           workspaceId,
           aql,
           schemaId,
-          ...(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
             version: VERSION_TWO
           } : {})
         },
@@ -374,4 +377,4 @@ const contextData = {
     ...analyticsContextAttributes
   }
 };
-export const AssetsConfigModal = withAnalyticsContext(contextData)(props => jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props))));
+export const AssetsConfigModal = withAnalyticsContext(contextData)(props => jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props)))));

package/dist/es2019/ui/common/modal/datasource-context/index.js

@@ -51,7 +51,7 @@ export const DatasourceContextProvider = ({
     onWrappedColumnChange,
     parameters,
     setParameters,
-    onInsert
+    onInsert: onInsert
   }), [datasourceId, isValidParameters, tableState, visibleColumnCount, visibleColumnKeys, onVisibleColumnKeysChange, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange, parameters, onInsert]);
   return /*#__PURE__*/React.createElement(DatasourceContext.Provider, {
     value: contextValue

package/dist/es2019/ui/common/modal/datasource-modal/createDatasourceModal.js

@@ -0,0 +1,51 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+import React from 'react';
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+import { jsx } from '@emotion/react';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
+import { DatasourceExperienceIdProvider } from '../../../../contexts/datasource-experience-id';
+import { UserInteractionsProvider } from '../../../../contexts/user-interactions';
+import { DatasourceContextProvider } from '../datasource-context';
+import { DatasourceViewModeProvider } from '../mode-switcher/useViewModeContext';
+const DEFAULT_VIEW_MODE = 'table';
+export const createDatasourceModal = ({
+  isValidParameters,
+  dataProvider,
+  component: ModalContent
+}) => {
+  return props => {
+    const {
+      datasourceId,
+      visibleColumnKeys,
+      columnCustomSizes,
+      wrappedColumnKeys,
+      parameters,
+      onInsert,
+      viewMode
+    } = props;
+    return jsx(AnalyticsContext, {
+      data: {
+        source: 'datasourceConfigModal',
+        component: 'datasourceConfigModal',
+        attributes: {
+          dataProvider
+        }
+      }
+    }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(DatasourceContextProvider, {
+      datasourceId: datasourceId,
+      initialVisibleColumnKeys: visibleColumnKeys,
+      initialColumnCustomSizes: columnCustomSizes,
+      initialWrappedColumnKeys: wrappedColumnKeys,
+      initialParameters: parameters,
+      isValidParameters: isValidParameters,
+      onInsert: onInsert
+    }, jsx(DatasourceViewModeProvider, {
+      viewMode: viewMode !== null && viewMode !== void 0 ? viewMode : DEFAULT_VIEW_MODE
+    }, jsx(ModalContent, props))))));
+  };
+};

package/dist/es2019/ui/common/modal/datasources-table-in-modal-preview/index.js

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
+import React, { useCallback } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { DatasourceAction } from '../../../../analytics/types';
+import { useUserInteractions } from '../../../../contexts/user-interactions';
 import { IssueLikeDataTableView } from '../../../issue-like-table';
 import { useDatasourceContext } from '../datasource-context';
 const Table = props => {
@@ -22,13 +24,18 @@ const Table = props => {
       extensionKey = null
     }
   } = useDatasourceContext();
+  const userInteractions = useUserInteractions();
+  const handleOnNextPage = useCallback((onNextPageProps = {}) => {
+    userInteractions.add(DatasourceAction.NEXT_PAGE_SCROLLED);
+    onNextPage(onNextPageProps);
+  }, [onNextPage, userInteractions]);
   return /*#__PURE__*/React.createElement(IssueLikeDataTableView, _extends({}, props, {
     status: status,
     columns: columns,
     items: responseItems,
     hasNextPage: hasNextPage,
     visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
-    onNextPage: onNextPage,
+    onNextPage: handleOnNextPage,
     onLoadDatasourceDetails: loadDatasourceDetails,
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     extensionKey: extensionKey,

package/dist/es2019/ui/common/modal/insert-button/index.js

@@ -18,6 +18,7 @@ export const InsertButton = ({
   testId,
   url,
   getAnalyticsPayload,
+  overwriteParameters,
   children
 }) => {
   const {
@@ -47,12 +48,12 @@ export const InsertButton = ({
     const insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
       attributes: {
-        ...getAnalyticsPayload(),
         totalItemCount: totalCount || 0,
         displayedColumnCount: visibleColumnCount.current,
         display: currentViewMode === 'inline' ? DatasourceDisplay.DATASOURCE_INLINE : DatasourceDisplay.DATASOURCE_TABLE,
         searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
-        actions: userInteractions.get()
+        actions: userInteractions.get(),
+        ...getAnalyticsPayload()
       },
       eventType: 'ui'
     });
@@ -68,7 +69,7 @@ export const InsertButton = ({
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: parameters,
+        parameters: overwriteParameters ? overwriteParameters(parameters) : parameters,
         views: [{
           type: 'table',
           properties: {
@@ -89,7 +90,7 @@ export const InsertButton = ({
         }]
       }, url), consumerEvent);
     }
-  }, [isValidParameters, parameters, url, getAnalyticsPayload, totalCount, visibleColumnCount, currentViewMode, userInteractions, onInsert, datasourceId, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, overwriteParameters, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys]);
   return jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -8,7 +8,7 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import { withAnalyticsContext } from '@atlaskit/analytics-next';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -21,6 +21,7 @@ import { DatasourceExperienceIdProvider } from '../../../contexts/datasource-exp
 import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { NoInstancesView } from '../../common/error-state/no-instances';
@@ -29,12 +30,13 @@ import { InitialStateView } from '../../common/initial-state-view';
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
-import { DatasourceContextProvider, useDatasourceContext } from '../../common/modal/datasource-context';
+import { useDatasourceContext } from '../../common/modal/datasource-context';
 import { DatasourceModal } from '../../common/modal/datasource-modal';
+import { createDatasourceModal } from '../../common/modal/datasource-modal/createDatasourceModal';
 import DatasourcesTableInModalPreview from '../../common/modal/datasources-table-in-modal-preview';
 import { InsertButton } from '../../common/modal/insert-button';
 import { DatasourceViewModeDropDown } from '../../common/modal/mode-switcher';
-import { DatasourceViewModeProvider, useViewModeContext } from '../../common/modal/mode-switcher/useViewModeContext';
+import { useViewModeContext } from '../../common/modal/mode-switcher/useViewModeContext';
 import TableSearchCount from '../../common/modal/search-count';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState } from '../../issue-like-table';
@@ -42,7 +44,6 @@ import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
 import { confluenceSearchModalMessages } from './messages';
 import { PlainConfluenceSearchConfigModal as PlainConfluenceSearchConfigModalOld } from './ModalOld';
-const DEFAULT_VIEW_MODE = 'table';
 const inputContainerStyles = xcss({
   alignItems: 'baseline',
   display: 'flex',
@@ -74,7 +75,6 @@ const useUpdateParametersOnFormUpdate = (cloudId, searchString, lastModified, co
 export const PlainConfluenceSearchConfigModal = props => {
   const {
     onCancel,
-    parameters: initialParameters,
     url: urlBeingEdited,
     disableDisplayDropdown = false,
     overrideParameters
@@ -82,23 +82,6 @@ export const PlainConfluenceSearchConfigModal = props => {
   const {
     currentViewMode
   } = useViewModeContext();
-  const [cloudId, setCloudId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId);
-  const {
-    availableSites,
-    selectedSite: selectedConfluenceSite
-  } = useAvailableSites('confluence', cloudId);
-  const [searchString, setSearchString] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString);
-  const [contributorAccountIds, setContributorAccountIds] = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []);
-  const [lastModified, setLastModified] = useState(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
-    value: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified,
-    from: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedFrom,
-    to: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedTo
-  } : undefined);
-
-  // analytics related parameters
-  const searchCount = useRef(0);
-  const userInteractions = useUserInteractions();
-  useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
   const {
     visibleColumnKeys,
     tableState: {
@@ -113,6 +96,23 @@ export const PlainConfluenceSearchConfigModal = props => {
     visibleColumnCount,
     parameters
   } = useDatasourceContext();
+  const [cloudId, setCloudId] = useState(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId);
+  const {
+    availableSites,
+    selectedSite: selectedConfluenceSite
+  } = useAvailableSites('confluence', cloudId);
+  const [searchString, setSearchString] = useState(parameters === null || parameters === void 0 ? void 0 : parameters.searchString);
+  const [contributorAccountIds, setContributorAccountIds] = useState((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []);
+  const [lastModified, setLastModified] = useState(parameters !== null && parameters !== void 0 && parameters.lastModified ? {
+    value: parameters === null || parameters === void 0 ? void 0 : parameters.lastModified,
+    from: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedFrom,
+    to: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedTo
+  } : undefined);
+
+  // analytics related parameters
+  const searchCount = useRef(0);
+  const userInteractions = useUserInteractions();
+  useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
@@ -305,7 +305,7 @@ export const PlainConfluenceSearchConfigModal = props => {
   }, jsx(ConfluenceSearchContainer, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: isValidParameters(parameters) ? parameters : {
+    parameters: parameters && isValidParameters(parameters) ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {
@@ -340,19 +340,16 @@ const contextData = {
     ...analyticsContextAttributes
   }
 };
-export const ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(props => {
-  var _props$viewMode;
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
-    datasourceId: props.datasourceId,
-    initialVisibleColumnKeys: props.visibleColumnKeys,
-    initialColumnCustomSizes: props.columnCustomSizes,
-    initialWrappedColumnKeys: props.wrappedColumnKeys,
-    initialParameters: props.parameters,
-    isValidParameters: isValidParameters,
-    onInsert: props.onInsert
-  }, jsx(DatasourceViewModeProvider, {
-    viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
-  }, jsx(PlainConfluenceSearchConfigModal, props))) :
-  // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
-  jsx(PlainConfluenceSearchConfigModalOld, props)));
-});
+const ConnectedConfluenceSearchConfigModal = createDatasourceModal({
+  isValidParameters,
+  dataProvider: 'confluence-search',
+  component: PlainConfluenceSearchConfigModal
+});
+export const ConfluenceSearchConfigModal = props => {
+  if (fg('platform-datasources-use-refactored-config-modal')) {
+    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, props));
+  }
+  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
+    data: contextData
+  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainConfluenceSearchConfigModalOld, props)))));
+};

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -8,7 +8,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';
 import { startUfoExperience } from '../../analytics/ufoExperiences';
@@ -18,6 +18,7 @@ import { fetchMessagesForLocale } from '../../common/utils/locale/fetch-messages
 import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../contexts/datasource-experience-id';
 import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
 import i18nEN from '../../i18n/en';
+import { StoreContainer } from '../../state';
 import { ScrollableContainerHeight } from '../../ui/issue-like-table/styled';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
 import { AccessRequired } from '../common/error-state/access-required';
@@ -115,7 +116,7 @@ const DatasourceTableViewWithoutAnalytics = ({
   const forcedReset = useCallback(() => {
     reset({
       shouldForceRequest: true,
-      shouldResetColumns: getBooleanFF('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
+      shouldResetColumns: fg('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
     });
   }, [reset, datasourceId]);
   const onRefresh = useCallback(() => {
@@ -185,4 +186,4 @@ const DatasourceTableViewWithoutAnalytics = ({
     url: url
   })));
 };
-export const DatasourceTableView = withAnalyticsContext(componentMetadata.tableView)(props => jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props)));
+export const DatasourceTableView = withAnalyticsContext(componentMetadata.tableView)(props => jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props))));