@atlaskit/link-datasource 1.15.2 → 1.15.4

package/dist/esm/ui/assets-modal/modal/render-assets-content/index.js

@@ -1,9 +1,16 @@
-import React, { useMemo } from 'react';
+/** @jsx jsx */
+import { useMemo } from 'react';
+import { css, jsx } from '@emotion/react';
 import { AccessRequired } from '../../../common/error-state/access-required';
 import { ModalLoadingError } from '../../../common/error-state/modal-loading-error';
 import { NoResults } from '../../../common/error-state/no-results';
 import { EmptyState, IssueLikeDataTableView } from '../../../issue-like-table';
 import { InitialStateView } from './initial-state-view';
+// This is to prevent y scrollbar when initially fetching data
+var emptyStateOverrideStyles = css({
+  height: '420px',
+  overflow: 'hidden'
+});
 export var RenderAssetsContent = function RenderAssetsContent(props) {
   var status = props.status,
     responseItems = props.responseItems,
@@ -14,10 +21,11 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
     columns = props.columns,
     defaultVisibleColumnKeys = props.defaultVisibleColumnKeys,
     onVisibleColumnKeysChange = props.onVisibleColumnKeysChange,
-    modalRenderInstanceId = props.modalRenderInstanceId;
+    modalRenderInstanceId = props.modalRenderInstanceId,
+    isFetchingInitialData = props.isFetchingInitialData;
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var issueLikeDataTableView = useMemo(function () {
-    return /*#__PURE__*/React.createElement(IssueLikeDataTableView, {
+    return jsx(IssueLikeDataTableView, {
       testId: "asset-datasource-table",
       status: status,
       columns: columns,
@@ -30,16 +38,23 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
       parentContainerRenderInstanceId: modalRenderInstanceId
     });
   }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
-  if (status === 'rejected') {
-    return /*#__PURE__*/React.createElement(ModalLoadingError, null);
+  if (isFetchingInitialData) {
+    // Placing this check first as it's a priority before all others
+    return jsx("div", {
+      css: emptyStateOverrideStyles
+    }, jsx(EmptyState, {
+      testId: "assets-aql-datasource-modal--loading-state"
+    }));
+  } else if (status === 'rejected') {
+    return jsx(ModalLoadingError, null);
   } else if (status === 'unauthorized') {
-    return /*#__PURE__*/React.createElement(AccessRequired, null);
+    return jsx(AccessRequired, null);
   } else if (status === 'empty') {
-    return /*#__PURE__*/React.createElement(InitialStateView, null);
+    return jsx(InitialStateView, null);
   } else if (resolvedWithNoResults) {
-    return /*#__PURE__*/React.createElement(NoResults, null);
+    return jsx(NoResults, null);
   } else if (status === 'loading' && !columns.length) {
-    return /*#__PURE__*/React.createElement(EmptyState, {
+    return jsx(EmptyState, {
       testId: "assets-aql-datasource-modal--loading-state"
     });
   }

package/dist/esm/ui/assets-modal/search-container/index.js

@@ -28,7 +28,7 @@ export var AssetsSearchContainer = function AssetsSearchContainer(props) {
   return jsx(Form, {
     onSubmit: onFormSubmit
   }, function (_ref) {
-    var _initialSearchData$ob, _initialSearchData$aq;
+    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
     var formProps = _ref.formProps;
     return jsx(FormContainer, _extends({}, formProps, {
       id: SEARCH_FORM_ID
@@ -37,6 +37,7 @@ export var AssetsSearchContainer = function AssetsSearchContainer(props) {
     }, modalTitle, jsx(SchemaSelectContainer, null, jsx(AssetsObjectSchemaSelect, {
       value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
       workspaceId: workspaceId,
+      initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
       classNamePrefix: "assets-datasource-modal--object-schema-select"
     }))), jsx(FormRowContainer, null, jsx(AqlSearchInput, {
       value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,

package/dist/esm/ui/assets-modal/search-container/object-schema-select/index.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["onChange", "onFocus"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -9,14 +8,12 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /** @jsx jsx */
 
-import { useEffect, useState } from 'react';
 import { jsx } from '@emotion/react';
 import debounce from 'debounce-promise';
 import { useIntl } from 'react-intl-next';
 import { Field } from '@atlaskit/form';
 import { AsyncSelect } from '@atlaskit/select';
 import { layers } from '@atlaskit/theme/constants';
-import { useDatasourceAnalyticsEvents } from '../../../../analytics';
 import { useObjectSchemas } from '../../../../hooks/useObjectSchemas';
 import { objectSchemaKey } from '../../../../types/assets/types';
 import { FieldContainer } from '../styled';
@@ -46,74 +43,35 @@ export var selectInAModalStyleFixProps = {
 export var AssetsObjectSchemaSelect = function AssetsObjectSchemaSelect(_ref) {
   var value = _ref.value,
     workspaceId = _ref.workspaceId,
+    initialObjectSchemas = _ref.initialObjectSchemas,
     _ref$classNamePrefix = _ref.classNamePrefix,
     classNamePrefix = _ref$classNamePrefix === void 0 ? 'assets-datasource-modal--object-schema-select' : _ref$classNamePrefix;
-  var _useState = useState(null),
-    _useState2 = _slicedToArray(_useState, 2),
-    defaultOptions = _useState2[0],
-    setDefaultOptions = _useState2[1];
-  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useObjectSchemas = useObjectSchemas(workspaceId),
     fetchObjectSchemas = _useObjectSchemas.fetchObjectSchemas,
     objectSchemasLoading = _useObjectSchemas.objectSchemasLoading;
   var selectedObjectSchema = value ? objectSchemaToSelectOption(value) : undefined;
-  useEffect(function () {
-    var fetchInitialData = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var _yield$fetchObjectSch, objectSchemas, totalObjectSchemas;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return fetchObjectSchemas('');
-            case 2:
-              _yield$fetchObjectSch = _context.sent;
-              objectSchemas = _yield$fetchObjectSch.objectSchemas;
-              totalObjectSchemas = _yield$fetchObjectSch.totalObjectSchemas;
-              // We only want to send modal ready event once after we've fetched the schema count
-              fireEvent('ui.modal.ready.datasource', {
-                schemasCount: totalObjectSchemas !== null && totalObjectSchemas !== void 0 ? totalObjectSchemas : 0,
-                instancesCount: null
-              });
-              setDefaultOptions(mapObjectSchemasToOptions(objectSchemas));
-            case 7:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function fetchInitialData() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    if (defaultOptions === null) {
-      fetchInitialData();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   var loadOptions = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(inputValue) {
-      var _yield$fetchObjectSch2, objectSchemas;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(inputValue) {
+      var _yield$fetchObjectSch, objectSchemas;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context2.next = 2;
+            _context.next = 2;
             return fetchObjectSchemas(inputValue);
           case 2:
-            _yield$fetchObjectSch2 = _context2.sent;
-            objectSchemas = _yield$fetchObjectSch2.objectSchemas;
-            return _context2.abrupt("return", mapObjectSchemasToOptions(objectSchemas));
+            _yield$fetchObjectSch = _context.sent;
+            objectSchemas = _yield$fetchObjectSch.objectSchemas;
+            return _context.abrupt("return", mapObjectSchemasToOptions(objectSchemas));
           case 5:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     return function loadOptions(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var debouncedLoadOptions = debounce(loadOptions, SEARCH_DEBOUNCE_MS);
@@ -129,16 +87,16 @@ export var AssetsObjectSchemaSelect = function AssetsObjectSchemaSelect(_ref) {
     validate: function validate(value) {
       return validateSchema(value);
     }
-  }, function (_ref4) {
-    var _ref4$fieldProps = _ref4.fieldProps,
-      _onChange = _ref4$fieldProps.onChange,
-      onFocus = _ref4$fieldProps.onFocus,
-      restFieldProps = _objectWithoutProperties(_ref4$fieldProps, _excluded);
+  }, function (_ref3) {
+    var _ref3$fieldProps = _ref3.fieldProps,
+      _onChange = _ref3$fieldProps.onChange,
+      onFocus = _ref3$fieldProps.onFocus,
+      restFieldProps = _objectWithoutProperties(_ref3$fieldProps, _excluded);
     return jsx(AsyncSelect, _extends({
       autoFocus: true,
       classNamePrefix: classNamePrefix,
       isLoading: objectSchemasLoading,
-      defaultOptions: defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : [],
+      defaultOptions: mapObjectSchemasToOptions(initialObjectSchemas),
       isSearchable: true,
       loadOptions: debouncedLoadOptions,
       placeholder: formatMessage(objectSchemaSelectMessages.placeholder),

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/types/hooks/useAssetsClient.d.ts

@@ -3,7 +3,11 @@ import { AssetsDatasourceParameters } from '../ui/assets-modal/types';
 export type UseAssetsClientState = {
     workspaceId: string | undefined;
     workspaceError: Error | undefined;
-    objectSchema: ObjectSchema | undefined;
+    existingObjectSchema: ObjectSchema | undefined;
+    existingObjectSchemaError: Error | undefined;
+    objectSchemas: ObjectSchema[] | undefined;
+    objectSchemasError: Error | undefined;
+    totalObjectSchemas: number | undefined;
     assetsClientLoading: boolean;
 };
 export declare const useAssetsClient: (initialParameters?: AssetsDatasourceParameters) => UseAssetsClientState;

package/dist/types/services/cmdbService.utils.d.ts

@@ -0,0 +1,9 @@
+export declare const mapFetchErrors: (error: any) => Error;
+export declare const getStatusCodeGroup: (error: Error) => "1xx" | "3xx" | "4xx" | "5xx" | "unknown";
+export declare class PermissionError extends Error {
+    constructor(message: string);
+}
+export declare class FetchError extends Error {
+    statusCode: number;
+    constructor(statusCode: number, message?: string);
+}

package/dist/types/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -1,6 +1,7 @@
-/// <reference types="react" />
+import { jsx } from '@emotion/react';
 import { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType } from '@atlaskit/linking-types';
 export interface RenderAssetsContentProps {
+    isFetchingInitialData: boolean;
     status: DatasourceTableStatusType;
     responseItems: DatasourceDataResponseItem[];
     visibleColumnKeys?: string[];
@@ -15,4 +16,4 @@ export interface RenderAssetsContentProps {
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;
     modalRenderInstanceId: string;
 }
-export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => JSX.Element;
+export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => jsx.JSX.Element;

package/dist/types/ui/assets-modal/search-container/index.d.ts

@@ -4,6 +4,7 @@ import { jsx } from '@emotion/react';
 import type { ObjectSchema } from '../../../types/assets/types';
 export type InitialSearchData = {
     objectSchema?: ObjectSchema;
+    objectSchemas?: ObjectSchema[];
     aql?: string;
 };
 export interface SearchContainerProps {

package/dist/types/ui/assets-modal/search-container/object-schema-select/index.d.ts

@@ -4,6 +4,7 @@ import { ObjectSchema } from '../../../../types/assets/types';
 type AssetsObjectSchemaSelectProps = {
     value: ObjectSchema | undefined;
     workspaceId: string;
+    initialObjectSchemas: ObjectSchema[] | undefined;
     classNamePrefix?: string;
 };
 export declare const SEARCH_DEBOUNCE_MS = 350;
@@ -17,5 +18,5 @@ export declare const selectInAModalStyleFixProps: {
     };
     menuPortalTarget: HTMLElement;
 };
-export declare const AssetsObjectSchemaSelect: ({ value, workspaceId, classNamePrefix, }: AssetsObjectSchemaSelectProps) => jsx.JSX.Element;
+export declare const AssetsObjectSchemaSelect: ({ value, workspaceId, initialObjectSchemas, classNamePrefix, }: AssetsObjectSchemaSelectProps) => jsx.JSX.Element;
 export {};

package/dist/types-ts4.5/hooks/useAssetsClient.d.ts

@@ -3,7 +3,11 @@ import { AssetsDatasourceParameters } from '../ui/assets-modal/types';
 export type UseAssetsClientState = {
     workspaceId: string | undefined;
     workspaceError: Error | undefined;
-    objectSchema: ObjectSchema | undefined;
+    existingObjectSchema: ObjectSchema | undefined;
+    existingObjectSchemaError: Error | undefined;
+    objectSchemas: ObjectSchema[] | undefined;
+    objectSchemasError: Error | undefined;
+    totalObjectSchemas: number | undefined;
     assetsClientLoading: boolean;
 };
 export declare const useAssetsClient: (initialParameters?: AssetsDatasourceParameters) => UseAssetsClientState;

package/dist/types-ts4.5/services/cmdbService.utils.d.ts

@@ -0,0 +1,9 @@
+export declare const mapFetchErrors: (error: any) => Error;
+export declare const getStatusCodeGroup: (error: Error) => "1xx" | "3xx" | "4xx" | "5xx" | "unknown";
+export declare class PermissionError extends Error {
+    constructor(message: string);
+}
+export declare class FetchError extends Error {
+    statusCode: number;
+    constructor(statusCode: number, message?: string);
+}

package/dist/types-ts4.5/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -1,6 +1,7 @@
-/// <reference types="react" />
+import { jsx } from '@emotion/react';
 import { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType } from '@atlaskit/linking-types';
 export interface RenderAssetsContentProps {
+    isFetchingInitialData: boolean;
     status: DatasourceTableStatusType;
     responseItems: DatasourceDataResponseItem[];
     visibleColumnKeys?: string[];
@@ -15,4 +16,4 @@ export interface RenderAssetsContentProps {
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;
     modalRenderInstanceId: string;
 }
-export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => JSX.Element;
+export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => jsx.JSX.Element;

package/dist/types-ts4.5/ui/assets-modal/search-container/index.d.ts

@@ -4,6 +4,7 @@ import { jsx } from '@emotion/react';
 import type { ObjectSchema } from '../../../types/assets/types';
 export type InitialSearchData = {
     objectSchema?: ObjectSchema;
+    objectSchemas?: ObjectSchema[];
     aql?: string;
 };
 export interface SearchContainerProps {

package/dist/types-ts4.5/ui/assets-modal/search-container/object-schema-select/index.d.ts

@@ -4,6 +4,7 @@ import { ObjectSchema } from '../../../../types/assets/types';
 type AssetsObjectSchemaSelectProps = {
     value: ObjectSchema | undefined;
     workspaceId: string;
+    initialObjectSchemas: ObjectSchema[] | undefined;
     classNamePrefix?: string;
 };
 export declare const SEARCH_DEBOUNCE_MS = 350;
@@ -17,5 +18,5 @@ export declare const selectInAModalStyleFixProps: {
     };
     menuPortalTarget: HTMLElement;
 };
-export declare const AssetsObjectSchemaSelect: ({ value, workspaceId, classNamePrefix, }: AssetsObjectSchemaSelectProps) => jsx.JSX.Element;
+export declare const AssetsObjectSchemaSelect: ({ value, workspaceId, initialObjectSchemas, classNamePrefix, }: AssetsObjectSchemaSelectProps) => jsx.JSX.Element;
 export {};

package/package.json

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