@atlaskit/link-datasource 1.19.43 → 1.19.44

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.19.44
+
+### Patch Changes
+
+- [#67222](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67222) [`c8245836a600`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c8245836a600) - Fix search race condition in Assets Config Modal
+
 ## 1.19.43
 
 ### Patch Changes

package/dist/cjs/hooks/useValidateAqlText.js

@@ -97,10 +97,10 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
         timeout.current();
       }
       if (value !== lastValue.current) {
+        setLastValidationResult({
+          type: 'loading'
+        });
         var timerId = setTimeout(function () {
-          setLastValidationResult({
-            type: 'loading'
-          });
           lastValue.current = value;
           lastResult.current = validateAqlText(value);
           resolve(lastResult.current);

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

@@ -204,7 +204,6 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   }, []);
   (0, _react.useEffect)(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   (0, _react.useEffect)(function () {
@@ -212,6 +211,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
+  (0, _react.useEffect)(function () {
+    visibleColumnCount.current = (visibleColumnKeys !== null && visibleColumnKeys !== void 0 ? visibleColumnKeys : []).length;
+  }, [visibleColumnKeys]);
   var isDisabled = !!errorState || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   var isEditingExistingTable = !!(initialParameters !== null && initialParameters !== void 0 && initialParameters.aql && initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId && initialParameters !== null && initialParameters !== void 0 && initialParameters.workspaceId);
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
@@ -294,13 +296,14 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       if (aql !== searchAql) {
         userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
       }
-      reset({
-        shouldResetColumns: true,
-        shouldForceRequest: true
-      });
       setAql(searchAql);
       setSchemaId(searchSchemaId);
+      setVisibleColumnKeys([]);
       setIsNewSearch(true);
+      reset({
+        shouldForceRequest: true,
+        shouldResetColumns: true
+      });
     }
   }, [aql, reset, schemaId, status]);
   var renderErrorState = (0, _react.useCallback)(function () {

package/dist/es2019/hooks/useValidateAqlText.js

@@ -59,10 +59,10 @@ export const useValidateAqlText = (workspaceId, initialValue) => {
       timeout.current();
     }
     if (value !== lastValue.current) {
+      setLastValidationResult({
+        type: 'loading'
+      });
       const timerId = setTimeout(() => {
-        setLastValidationResult({
-          type: 'loading'
-        });
         lastValue.current = value;
         lastResult.current = validateAqlText(value);
         resolve(lastResult.current);

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

@@ -180,7 +180,6 @@ const PlainAssetsConfigModal = props => {
   }, []);
   useEffect(() => {
     const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   useEffect(() => {
@@ -188,6 +187,9 @@ const PlainAssetsConfigModal = props => {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
+  useEffect(() => {
+    visibleColumnCount.current = (visibleColumnKeys !== null && visibleColumnKeys !== void 0 ? visibleColumnKeys : []).length;
+  }, [visibleColumnKeys]);
   const isDisabled = !!errorState || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   const isEditingExistingTable = !!(initialParameters !== null && initialParameters !== void 0 && initialParameters.aql && initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId && initialParameters !== null && initialParameters !== void 0 && initialParameters.workspaceId);
   const retrieveUrlForSmartCardRender = useCallback(() => {
@@ -269,13 +271,14 @@ const PlainAssetsConfigModal = props => {
       if (aql !== searchAql) {
         userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
       }
-      reset({
-        shouldResetColumns: true,
-        shouldForceRequest: true
-      });
       setAql(searchAql);
       setSchemaId(searchSchemaId);
+      setVisibleColumnKeys([]);
       setIsNewSearch(true);
+      reset({
+        shouldForceRequest: true,
+        shouldResetColumns: true
+      });
     }
   }, [aql, reset, schemaId, status]);
   const renderErrorState = useCallback(() => {

package/dist/esm/hooks/useValidateAqlText.js

@@ -90,10 +90,10 @@ export var useValidateAqlText = function useValidateAqlText(workspaceId, initial
         timeout.current();
       }
       if (value !== lastValue.current) {
+        setLastValidationResult({
+          type: 'loading'
+        });
         var timerId = setTimeout(function () {
-          setLastValidationResult({
-            type: 'loading'
-          });
           lastValue.current = value;
           lastResult.current = validateAqlText(value);
           resolve(lastResult.current);

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

@@ -195,7 +195,6 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   }, []);
   useEffect(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   useEffect(function () {
@@ -203,6 +202,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
+  useEffect(function () {
+    visibleColumnCount.current = (visibleColumnKeys !== null && visibleColumnKeys !== void 0 ? visibleColumnKeys : []).length;
+  }, [visibleColumnKeys]);
   var isDisabled = !!errorState || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   var isEditingExistingTable = !!(initialParameters !== null && initialParameters !== void 0 && initialParameters.aql && initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId && initialParameters !== null && initialParameters !== void 0 && initialParameters.workspaceId);
   var retrieveUrlForSmartCardRender = useCallback(function () {
@@ -285,13 +287,14 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       if (aql !== searchAql) {
         userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
       }
-      reset({
-        shouldResetColumns: true,
-        shouldForceRequest: true
-      });
       setAql(searchAql);
       setSchemaId(searchSchemaId);
+      setVisibleColumnKeys([]);
       setIsNewSearch(true);
+      reset({
+        shouldForceRequest: true,
+        shouldResetColumns: true
+      });
     }
   }, [aql, reset, schemaId, status]);
   var renderErrorState = useCallback(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.19.43",
+  "version": "1.19.44",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -48,7 +48,7 @@
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.8.0",
     "@atlaskit/linking-common": "^5.3.0",
-    "@atlaskit/linking-types": "^8.5.0",
+    "@atlaskit/linking-types": "^8.6.0",
     "@atlaskit/lozenge": "^11.6.0",
     "@atlaskit/modal-dialog": "^12.10.0",
     "@atlaskit/platform-feature-flags": "^0.2.4",
@@ -56,7 +56,7 @@
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^0.12.0",
     "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^0.6.0",
     "@atlaskit/pragmatic-drag-and-drop-react-indicator": "^0.18.0",
-    "@atlaskit/primitives": "^1.18.0",
+    "@atlaskit/primitives": "^1.19.0",
     "@atlaskit/select": "^17.0.3",
     "@atlaskit/smart-card": "^26.45.0",
     "@atlaskit/spinner": "^16.0.0",