Fix unsupported listing on create dataset from connection (#3077)

dvortsovs · web-flow · commit 201dff7436c5 · 2025-10-29T18:42:23.000+03:00
diff --git a/src/ui/units/datasets/containers/DatasetSources/DatasetSources.js b/src/ui/units/datasets/containers/DatasetSources/DatasetSources.js
@@ -276,21 +276,23 @@ export class DatasetSources extends React.Component {
         }
     };
 
-    retryToGetSources = () => {
+    retryToGetSources = async () => {
         const {
             selectedConnection: {entryId} = {},
             workbookId,
             sourcesPagination,
-            options,
-            currentDbName,
+            resetSourcesPagination,
+            getSourcesListingOptions,
         } = this.props;
 
         if (!entryId) {
             return;
         }
-        const {serverPagination, dbNameRequiredForSearch} = getSourceListingValues(
-            options?.source_listing,
-        );
+
+        resetSourcesPagination();
+        const {sourceListing, currentDbName} = await getSourcesListingOptions(entryId);
+
+        const {serverPagination, dbNameRequiredForSearch} = getSourceListingValues(sourceListing);
 
         this.props.getSources({
             connectionId: entryId,
@@ -699,7 +701,9 @@ export class DatasetSources extends React.Component {
                     >
                         <SelectSourcePrototypes
                             sdk={sdk}
-                            isSourcesLoading={ui.isSourcesLoading}
+                            isSourcesLoading={
+                                ui.isSourcesLoading || ui.isSourcesListingOptionsLoading
+                            }
                             isDisabledAddSource={isUpdating}
                             isDisabledDropSource={this.isDisabledDropSource}
                             connections={connections}
diff --git a/src/ui/units/datasets/store/actions/creators/datasetTyped.ts b/src/ui/units/datasets/store/actions/creators/datasetTyped.ts
@@ -12,6 +12,7 @@ import type {
     Dataset,
     DatasetAvatarRelation,
     DatasetField,
+    DatasetOptions,
     DatasetSource,
     DatasetSourceAvatar,
     WorkbookId,
@@ -491,13 +492,16 @@ export function deleteConnection({
             },
         } = getState();
 
+        getSdk().cancelRequest('getSourceListingOptions');
+        getSdk().cancelRequest('getDbNames');
         getSdk().cancelRequest('getSources');
 
         if (
             (sourceLoadingError && sourceLoadingError.connectionId === connectionId) ||
             !selectedConnections.length
         ) {
             dispatch(setSourcesLoadingError(null));
+            dispatch(setSourcesListingOptionsError(null));
         }
     };
 }
@@ -804,6 +808,16 @@ export function toggleSourcesLoader(isSourcesLoading: boolean) {
         });
     };
 }
+
+export function toggleSourcesListingOptionsLoader(isLoading: boolean) {
+    return (dispatch: DatasetDispatch) => {
+        dispatch({
+            type: DATASET_ACTION_TYPES.TOGGLE_SOURCES_LISTING_OPTIONS_LOADER,
+            payload: {isLoading},
+        });
+    };
+}
+
 export function setSourcesLoadingError(error: DatasetError) {
     return (dispatch: DatasetDispatch) => {
         dispatch({
@@ -813,6 +827,15 @@ export function setSourcesLoadingError(error: DatasetError) {
     };
 }
 
+export function setSourcesListingOptionsError(error: DatasetError) {
+    return (dispatch: DatasetDispatch) => {
+        dispatch({
+            type: DATASET_ACTION_TYPES.SET_SOURCES_LISTING_OPTIONS_ERROR,
+            payload: {error},
+        });
+    };
+}
+
 export function setDatasetRevisionMismatch() {
     return (dispatch: DatasetDispatch) => {
         dispatch({type: DATASET_ACTION_TYPES.SET_DATASET_REVISION_MISMATCH});
@@ -1375,10 +1398,19 @@ export function getSources({
     isSideEffect = false,
 }: GetSourcesProps) {
     return async (dispatch: DatasetDispatch, getState: GetState) => {
+        const {
+            sourcesPagination,
+            errors: {sourceListingOptionsError},
+        } = getState().dataset;
+
+        if (sourceListingOptionsError) {
+            dispatch(setSourcesLoadingError(sourceListingOptionsError));
+            dispatch(setSourcesListingOptionsError(null));
+            return [];
+        }
         if (!isSideEffect) {
             dispatch(toggleSourcesLoader(true));
         }
-        const {sourcesPagination} = getState().dataset;
         let sources: GetSourceResponse['sources'] = [];
         const currentLimit = limit ? limit + 1 : 10000;
         try {
@@ -1447,27 +1479,28 @@ export function getSources({
 
 export function getDbNames(connectionIds: string[]) {
     return async (dispatch: DatasetDispatch, getState: GetState) => {
-        dispatch(toggleSourcesLoader(true));
+        dispatch(toggleSourcesListingOptionsLoader(true));
         try {
             if (connectionIds.length) {
                 const state = getState();
                 const {
                     options: {source_listing},
                 } = state.dataset;
                 const currentEntryId = selectedConnectionSelector(state)?.entryId;
-                const result = await Promise.allSettled(
+                const result = await Promise.all(
                     connectionIds.map((id) =>
                         getSdk()
-                            .sdk.bi.getDbNames({connectionId: id})
+                            .sdk.bi.getDbNames(
+                                {connectionId: id},
+                                {concurrentId: 'getDbNames', retries: 2},
+                            )
                             .then((res) => ({id, ...res})),
                     ),
                 );
-                const existingDbNames = result
-                    .filter((item) => item.status === 'fulfilled')
-                    .reduce<Record<string, string[]>>((acc, item) => {
-                        acc[item.value.id] = item.value.db_names;
-                        return acc;
-                    }, {});
+                const existingDbNames = result.reduce<Record<string, string[]>>((acc, item) => {
+                    acc[item.id] = item.db_names;
+                    return acc;
+                }, {});
 
                 batch(() => {
                     dispatch({
@@ -1481,8 +1514,9 @@ export function getDbNames(connectionIds: string[]) {
             }
         } catch (e) {
             logger.logError('dataset: getDbNames failed', e);
+            dispatch(setSourcesListingOptionsError(e));
         } finally {
-            dispatch(toggleSourcesLoader(false));
+            dispatch(toggleSourcesListingOptionsLoader(false));
         }
     };
 }
@@ -1806,6 +1840,7 @@ export function initializeDataset({connectionId}: {connectionId: string}) {
     return async (dispatch: DatasetDispatch) => {
         if (connectionId) {
             await dispatch(setInitialSources([connectionId]));
+            await dispatch(getSourcesListingOptions(connectionId));
         }
 
         dispatch(_getSources());
@@ -1963,29 +1998,39 @@ function _getSources() {
 
 export function getSourcesListingOptions(connectionId: string) {
     return async (dispatch: DatasetDispatch, getState: GetState) => {
-        dispatch(toggleSourcesLoader(true));
-
-        const result = await (DatasetUtils.isEnabledFeature(Feature.EnableDatasetSourcesPagination)
-            ? getSdk().sdk.bi.getSourceListingOptions({connectionId})
-            : undefined);
-
-        dispatch({
-            type: DATASET_ACTION_TYPES.SET_SOURCES_LISTING_OPTIONS,
-            payload: result?.source_listing,
-        });
+        dispatch(toggleSourcesListingOptionsLoader(true));
+        let sourceListing: DatasetOptions['source_listing'] | undefined;
+        try {
+            const result = await (DatasetUtils.isEnabledFeature(
+                Feature.EnableDatasetSourcesPagination,
+            )
+                ? getSdk().sdk.bi.getSourceListingOptions(
+                      {connectionId},
+                      {concurrentId: 'getSourceListingOptions', retries: 2},
+                  )
+                : undefined);
+            sourceListing = result?.source_listing;
 
-        const {dbNameRequiredForSearch, supportsDbNameListing} = getSourceListingValues(
-            result?.source_listing,
-        );
+            dispatch({
+                type: DATASET_ACTION_TYPES.SET_SOURCES_LISTING_OPTIONS,
+                payload: sourceListing,
+            });
 
-        dispatch(toggleSourcesLoader(false));
+            const {dbNameRequiredForSearch, supportsDbNameListing} =
+                getSourceListingValues(sourceListing);
 
-        if (dbNameRequiredForSearch || supportsDbNameListing) {
-            await dispatch(getDbNames([connectionId]));
+            if (dbNameRequiredForSearch || supportsDbNameListing) {
+                await dispatch(getDbNames([connectionId]));
+            }
+        } catch (error) {
+            logger.logError('dataset: getSourcesListingOptions failed', error);
+            dispatch(setSourcesListingOptionsError(error));
+        } finally {
+            dispatch(toggleSourcesListingOptionsLoader(false));
         }
 
         const currentDbName = getState().dataset.currentDbName;
 
-        return {sourceListing: result?.source_listing, currentDbName};
+        return {sourceListing, currentDbName};
     };
 }
diff --git a/src/ui/units/datasets/store/actions/types/dataset.ts b/src/ui/units/datasets/store/actions/types/dataset.ts
@@ -79,9 +79,16 @@ export const TOGGLE_FIELD_EDITOR_MODULE_LOADING = Symbol(
 );
 
 export const TOGGLE_SOURCES_LOADER = Symbol('dataset/TOGGLE_SOURCES_LOADER');
+export const TOGGLE_SOURCES_LISTING_OPTIONS_LOADER = Symbol(
+    'dataset/TOGGLE_SOURCES_LISTING_OPTIONS_LOADER',
+);
 export const SET_SOURCES_LOADING_ERROR = Symbol('dataset/SET_SOURCES_LOADING_ERROR');
 export const SET_DATASET_REVISION_MISMATCH = Symbol('dataset/SET_DATASET_REVISION_MISMATCH');
 
+export const SET_SOURCES_LISTING_OPTIONS_ERROR = Symbol(
+    'dataset/SET_SOURCES_LISTING_OPTIONS_ERROR',
+);
+
 export const EDITOR_SET_FILTER = Symbol('dataset/EDITOR_SET_FILTER');
 export const EDITOR_SET_ITEMS_TO_DISPLAY = Symbol('dataset/EDITOR_SET_ITEMS_TO_DISPLAY');
 
diff --git a/src/ui/units/datasets/store/constants.ts b/src/ui/units/datasets/store/constants.ts
@@ -68,6 +68,7 @@ export const initialState: DatasetReduxState = {
         savingError: null,
         sourceLoadingError: null,
         validationError: null,
+        sourceListingOptionsError: null,
     },
     validation: {
         isLoading: false,
@@ -89,6 +90,7 @@ export const initialState: DatasetReduxState = {
         isFieldEditorModuleLoading: false,
         isSourcesLoading: false,
         isSourcesSearchLoading: false,
+        isSourcesListingOptionsLoading: false,
     },
     editor: {
         filter: '',
diff --git a/src/ui/units/datasets/store/reducers/dataset.ts b/src/ui/units/datasets/store/reducers/dataset.ts
@@ -64,6 +64,7 @@ import {
     SET_LAST_MODIFIED_TAB,
     SET_QUEUE_TO_LOAD_PREVIEW,
     SET_SOURCES_LISTING_OPTIONS,
+    SET_SOURCES_LISTING_OPTIONS_ERROR,
     SET_SOURCES_LOADING_ERROR,
     SET_SOURCES_PAGINATION,
     SET_SOURCES_SEARCH_LOADING,
@@ -81,6 +82,7 @@ import {
     TOGGLE_FIELD_EDITOR_MODULE_LOADING,
     TOGGLE_LOAD_PREVIEW_BY_DEFAULT,
     TOGGLE_PREVIEW,
+    TOGGLE_SOURCES_LISTING_OPTIONS_LOADER,
     TOGGLE_SOURCES_LOADER,
     TOGGLE_VIEW_PREVIEW,
     UPDATE_FIELD,
@@ -1265,9 +1267,16 @@ export default (state: DatasetReduxState = initialState, action: DatasetReduxAct
                 ...state,
                 sourcePrototypes: sourcePrototypesNext,
                 selectedConnections: selectedConnectionsNext,
+                currentDbName: undefined,
+                options: {
+                    ...state.options,
+                    source_listing: undefined,
+                },
                 ui: {
                     ...state.ui,
                     selectedConnectionId: selectedConnectionIdNext,
+                    isSourcesSearchLoading: false,
+                    isSourcesLoading: false,
                 },
             };
         }
@@ -1309,6 +1318,17 @@ export default (state: DatasetReduxState = initialState, action: DatasetReduxAct
                 },
             };
         }
+        case TOGGLE_SOURCES_LISTING_OPTIONS_LOADER: {
+            const {isLoading} = action.payload;
+
+            return {
+                ...state,
+                ui: {
+                    ...state.ui,
+                    isSourcesListingOptionsLoading: isLoading,
+                },
+            };
+        }
         case SET_SOURCES_LOADING_ERROR: {
             const {error} = action.payload;
 
@@ -1476,6 +1496,17 @@ export default (state: DatasetReduxState = initialState, action: DatasetReduxAct
                 },
             };
         }
+        case SET_SOURCES_LISTING_OPTIONS_ERROR: {
+            const {error} = action.payload;
+
+            return {
+                ...state,
+                errors: {
+                    ...state.errors,
+                    sourceListingOptionsError: error,
+                },
+            };
+        }
         default: {
             return state;
         }
diff --git a/src/ui/units/datasets/store/types/dataset.ts b/src/ui/units/datasets/store/types/dataset.ts
