fix(Sort,Merge): get rid of missing node errors [YTFRONT-4392]

ytsaurus · Oct 2, 2024 · cf79a79 · cf79a79
1 parent 4897f6f
commit cf79a79
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/packages/ui/src/ui/store/actions/navigation/modals/table-merge-sort-modal.tsx b/packages/ui/src/ui/store/actions/navigation/modals/table-merge-sort-modal.tsx
@@ -12,7 +12,11 @@ import axios, {CancelTokenSource} from 'axios';
 // @ts-ignore
 import yt from '@ytsaurus/javascript-wrapper/lib/yt';
 import ypath from '../../../../common/thor/ypath';
-import {getBatchError, wrapApiPromiseByToaster} from '../../../../utils/utils';
+import {
+    USE_SKIP_ERROR_FN_NODE_DOES_NOT_EXIST,
+    getBatchError,
+    wrapApiPromiseByToaster,
+} from '../../../../utils/utils';
 import {loadPoolTreesIfNotLoaded} from '../../../../store/actions/global';
 import {OperationShortInfo} from '../../../../pages/components/OperationShortInfo/OperationShortInfo';
 import {AppStoreProvider} from '../../../../containers/App/AppStoreProvider';
@@ -167,6 +171,7 @@ export const loadStorageAttributes =
                 errorTitle: 'Get table attributes request is failed',
                 autoHide: false,
                 skipSuccessToast: true,
+                ...USE_SKIP_ERROR_FN_NODE_DOES_NOT_EXIST,
             },
         );
 

diff --git a/packages/ui/src/ui/utils/utils.tsx b/packages/ui/src/ui/utils/utils.tsx
@@ -71,6 +71,12 @@ export interface SplitedBatchResults<T> {
 }
 
 export const USE_IGNORE_NODE_DOES_NOT_EXIST = {ignoreErrorCodes: [YTErrors.NODE_DOES_NOT_EXIST]};
+export const USE_SKIP_ERROR_FN_NODE_DOES_NOT_EXIST: Pick<
+    Required<CommonWrapApiOptions<unknown>>,
+    'skipErrorFn'
+> = {
+    skipErrorFn: ({code}) => code === YTErrors.NODE_DOES_NOT_EXIST,
+};
 
 export function splitBatchResults<T = unknown>(
     batchResults: Array<BatchResultsItem<T>>,
@@ -197,9 +203,9 @@ export function wrapApiPromiseByToaster<T>(p: Promise<T>, options: WrapApiOption
 
                 const {skipErrorFn, skipErrorToast} = options;
 
-                const isVisibleError = skipErrorFn ? skipErrorFn : (_e: unknown) => !skipErrorToast;
+                const isSkippedError = skipErrorFn ? skipErrorFn : (_e: unknown) => skipErrorToast;
 
-                if (isVisibleError(error)) {
+                if (!isSkippedError(error)) {
                     toaster.add({
                         name: options.toasterName,
                         theme: 'danger',