@retailcrm/datalens-ui 0.2.4 → 0.2.6

package/ui/libs/DatalensChartkit/menu/MenuItems.js

@@ -12,16 +12,24 @@ import { isEnabledFeature } from "../../../utils/isEnabledFeature.js";
 import { getExportItem, isExportItemDisabled } from "../components/ChartKitBase/components/Header/components/Menu/Items/Export/Export.js";
 import getInspectorMenuitem from "../components/ChartKitBase/components/Header/components/Menu/Items/Inspector/Inspector.js";
 import ChartKitIcon_default from "../components/ChartKitIcon/ChartKitIcon.js";
+import { getRouter, getLocation } from "../../../navigation/router.js";
 import { Feature } from "../../../../shared/types/feature.js";
 import { MenuItemsIds } from "../../../../shared/types/menu.js";
 import { DL, URL_OPTIONS } from "../../../constants/common.js";
 import { WidgetKind } from "../../../../shared/types/widget.js";
 import { PREVIEW_ROUTE } from "../../../../shared/constants/entry.js";
-import { getLocation } from "../../../navigation/router.js";
 import { FOCUSED_WIDGET_PARAM_NAME } from "../../../../shared/constants/dash.js";
 const getExportMenuItem = getExportItem;
 const getInspectorMenuItem = getInspectorMenuitem;
 const alertI18n = I18n.keyset("component.chartkit-alerts.view");
+const openInternalUrlInNewTab = (rawUrl) => {
+  const url = new URL(rawUrl, window.location.origin);
+  getRouter().openTab({
+    pathname: url.pathname,
+    search: url.search,
+    hash: url.hash
+  });
+};
 const getAlertsMenuItem = ({
   chartsDataProvider,
   customConfig
@@ -89,7 +97,7 @@ const getNewWindowMenuItem = ({
         }
       )
     );
-    window.open(link);
+    openInternalUrlInNewTab(link.toString());
   })
 });
 const getEditMenuItem = ({
@@ -103,14 +111,15 @@ const getEditMenuItem = ({
   icon: customConfig?.icon || /* @__PURE__ */ jsx(ChartKitIcon_default, { data: Pencil }),
   isVisible: () => !DL.IS_MOBILE && (customConfig?.isVisible ? customConfig.isVisible() : true),
   action: customConfig?.action || (({ loadedData = {}, propsData, chartsDataProvider: dataProvider }) => {
-    window.open(
-      (dataProvider || chartsDataProvider)?.getGoAwayLink(
-        { loadedData, propsData },
-        {
-          idPrefix: "/navigate/"
-        }
-      )
+    const url = (dataProvider || chartsDataProvider)?.getGoAwayLink(
+      { loadedData, propsData },
+      {
+        idPrefix: "/navigate/"
+      }
     );
+    if (url) {
+      openInternalUrlInNewTab(url);
+    }
   })
 });
 const getOpenAsTableMenuItem = ({
@@ -131,15 +140,14 @@ const getOpenAsTableMenuItem = ({
     return Boolean(!isCriticalError && isExportAllowed && isChart && customIsVisible);
   },
   action: customConfig?.action || (({ loadedData, propsData, chartsDataProvider: dataProvider }) => {
-    window.open(
-      (dataProvider || chartsDataProvider).getGoAwayLink(
-        { loadedData, propsData },
-        {
-          extraParams: { _chart_type: "table" },
-          idPrefix: "/preview/"
-        }
-      )
+    const url = (dataProvider || chartsDataProvider).getGoAwayLink(
+      { loadedData, propsData },
+      {
+        extraParams: { _chart_type: "table" },
+        idPrefix: "/preview/"
+      }
     );
+    openInternalUrlInNewTab(url);
   })
 });
 const getLinkMenuItem = (customConfig) => ({

package/ui/libs/DatalensChartkit/modules/data-provider/charts/ui-sandbox.js

@@ -4,6 +4,7 @@ import get from "lodash/get";
 import merge from "lodash/merge";
 import set from "lodash/set";
 import { chartStorage } from "../../../ChartKit/plugins/chart-storage.js";
+import "../../../../../navigation/index.js";
 import "../../../../../../shared/index.js";
 import { wrapHtml } from "../../../../../../shared/utils/ui-sandbox.js";
 import { getRandomCKId } from "../../../ChartKit/helpers/getRandomCKId.js";
@@ -13,11 +14,32 @@ import { generateHtml } from "../../html-generator/index.js";
 import { getParseHtmlFn } from "../../html-generator/utils.js";
 import { UiSandboxRuntime } from "./ui-sandbox-runtime.js";
 import { clearVmProp } from "./utils.js";
+import { getRouter } from "../../../../../navigation/router.js";
 import { EditorType, LegacyEditorType } from "../../../../../../shared/types/widget.js";
 import { WRAPPED_FN_KEY } from "../../../../../../shared/constants/ui-sandbox.js";
 import { WRAPPED_HTML_KEY } from "../../../../../../shared/constants/chartkit-handlers.js";
 const UI_SANDBOX_TOTAL_TIME_LIMIT = 3e3;
 const UI_SANDBOX_FN_TIME_LIMIT = 100;
+const openSandboxUrl = (rawUrl, target) => {
+  if (typeof window === "undefined") {
+    return;
+  }
+  const windowTarget = target === "_self" ? "_self" : "_blank";
+  const href = sanitizeUrl(rawUrl);
+  const url = new URL(href, window.location.origin);
+  if (url.origin === window.location.origin) {
+    getRouter().open(
+      {
+        pathname: url.pathname,
+        search: url.search,
+        hash: url.hash
+      },
+      windowTarget
+    );
+    return;
+  }
+  window.open(url.toString(), windowTarget);
+};
 let uiSandbox;
 let getInterruptAfterDeadlineHandler;
 const getUISandbox = async () => {
@@ -196,8 +218,7 @@ async function getUnwrappedFunction(args) {
           window: {
             open: function(url, target) {
               try {
-                const href = sanitizeUrl(url);
-                window.open(href, target === "_self" ? "_self" : "_blank");
+                openSandboxUrl(url, target);
               } catch (e) {
                 console.error(e);
               }

package/ui/units/connections/components/ConnectorForm/components/Datepicker/Datepicker.d.ts

@@ -515,4 +515,4 @@ export declare const Datepicker: ConnectedComponent<{
     validationErrors?: ValidationError[];
     width?: BaseControlItem["width"];
     hintText?: BaseControlItem["hintText"];
-}, "form" | "actions" | "innerForm" | "validationErrors">>;
+}, "form" | "actions" | "validationErrors" | "innerForm">>;

package/ui/units/connections/components/ConnectorForm/components/FileInput/FileInput.d.ts

@@ -598,5 +598,5 @@ export declare const FileInput: ConnectedComponent<{
     validationErrors?: ValidationError[];
     width?: BaseControlItem["width"];
     hintText?: BaseControlItem["hintText"];
-}, "form" | "actions" | "innerForm" | "validationErrors">>;
+}, "form" | "actions" | "validationErrors" | "innerForm">>;
 export {};

package/ui/units/connections/components/ConnectorForm/components/Input/Input.d.ts

@@ -546,4 +546,4 @@ export declare const Input: ConnectedComponent<{
     validationErrors?: ValidationError[];
     width?: BaseControlItem["width"];
     hintText?: BaseControlItem["hintText"];
-}, "form" | "actions" | "innerForm" | "validationErrors">>;
+}, "form" | "actions" | "validationErrors" | "innerForm">>;

package/ui/units/connections/components/ConnectorForm/components/Select/Select.d.ts

@@ -547,4 +547,4 @@ export declare const Select: ConnectedComponent<{
     validationErrors?: ValidationError[];
     width?: BaseControlItem["width"];
     hintText?: BaseControlItem["hintText"];
-}, "form" | "actions" | "innerForm" | "validationErrors">>;
+}, "form" | "actions" | "validationErrors" | "innerForm">>;

package/ui/units/dash/components/DashActionPanel/DashActionPanel.d.ts

@@ -55,6 +55,8 @@ declare class DashActionPanel extends React.PureComponent<ActionPanelProps, Acti
     private getAdditionalEntryItems;
     private onSelectStateClick;
     private onValueTableOfContentsClick;
+    private isDashboardBreadcrumbEditingAccessible;
+    private filterEntryContextMenuItems;
     private handleGoBack;
     private handleGoForward;
     private handleSaveDash;

package/ui/units/dash/components/DashActionPanel/DashActionPanel.js

@@ -8,7 +8,9 @@ import { connect } from "react-redux";
 import "../../../../../shared/index.js";
 import { ActionPanelEntryContextMenuQa } from "../../../../../shared/constants/qa/action-panel.js";
 import "../../../../index.js";
+import { capabilities } from "../../../../capabilities/index.js";
 import ActionPanel from "../../../../components/ActionPanel/ActionPanel.js";
+import "../../../../components/EntryContextMenu/index.js";
 import { registry } from "../../../../registry/index.js";
 import { closeDialog, openDialogConfirm } from "../../../../store/actions/dialog.js";
 import { goForward, goBack } from "../../../../store/actions/editHistory.js";
@@ -30,13 +32,29 @@ import { EditControls } from "./EditControls/EditControls.js";
 import { ViewControls } from "./ViewControls/ViewControls.js";
 import { cancelEditClick } from "./helpers.js";
 /* empty css                     */
+import { ENTRY_CONTEXT_MENU_ACTION } from "../../../../components/EntryContextMenu/constants.js";
 import { EntryDialogName } from "../../../../components/EntryDialogues/EntryDialogues.js";
 import { EntryDialogResolveStatus } from "../../../../components/EntryDialogues/constants.js";
+import { Capability } from "../../../../capabilities/capabilities.js";
+import { EntryScope } from "../../../../../shared/types/common.js";
 import { Feature } from "../../../../../shared/types/feature.js";
 import { DL } from "../../../../constants/common.js";
 import { ICONS_MENU_DEFAULT_SIZE } from "../../../../libs/DatalensChartkit/menu/constants.js";
 const b = block("dash-action-panel");
 const i18n = I18n.keyset("dash.action-panel.view");
+const HIDDEN_DASH_ACTION_PANEL_CONTEXT_MENU_ITEMS = /* @__PURE__ */ new Set([
+  ENTRY_CONTEXT_MENU_ACTION.RENAME,
+  ENTRY_CONTEXT_MENU_ACTION.DELETE,
+  ENTRY_CONTEXT_MENU_ACTION.MOVE,
+  ENTRY_CONTEXT_MENU_ACTION.COPY,
+  ENTRY_CONTEXT_MENU_ACTION.ACCESS,
+  ENTRY_CONTEXT_MENU_ACTION.SHARE,
+  ENTRY_CONTEXT_MENU_ACTION.MIGRATE_TO_WORKBOOK
+]);
+const DASH_BREADCRUMB_EDITING_MENU_ITEMS = /* @__PURE__ */ new Set([
+  "edit",
+  ENTRY_CONTEXT_MENU_ACTION.RENAME
+]);
 const _DashActionPanel = class _DashActionPanel extends React__default.PureComponent {
   constructor() {
     super(...arguments);
@@ -133,6 +151,22 @@ const _DashActionPanel = class _DashActionPanel extends React__default.PureCompo
     this.onValueTableOfContentsClick = () => {
       this.props.toggleTableOfContent();
     };
+    this.isDashboardBreadcrumbEditingAccessible = () => {
+      return capabilities.has(Capability.AccessibleDashboardBreadcrumbEditing);
+    };
+    this.filterEntryContextMenuItems = ({ items }) => {
+      const isDashboardBreadcrumbEditingAccessible = this.isDashboardBreadcrumbEditingAccessible();
+      const shouldHideDashEditingItems = this.props.entry?.scope === EntryScope.Dash && !isDashboardBreadcrumbEditingAccessible;
+      return items.filter((item) => {
+        if (HIDDEN_DASH_ACTION_PANEL_CONTEXT_MENU_ITEMS.has(item.id)) {
+          return false;
+        }
+        if (shouldHideDashEditingItems && DASH_BREADCRUMB_EDITING_MENU_ITEMS.has(item.id)) {
+          return false;
+        }
+        return true;
+      });
+    };
     this.handleGoBack = () => {
       if (this.props.canGoBack) {
         this.props.goBack({ unitId: DASH_EDIT_HISTORY_UNIT_ID });
@@ -183,6 +217,7 @@ const _DashActionPanel = class _DashActionPanel extends React__default.PureCompo
         {
           entry,
           additionalEntryItems: this.getAdditionalEntryItems(),
+          filterEntryContextMenuItems: this.filterEntryContextMenuItems,
           rightItems: [
             /* @__PURE__ */ jsx(
               DashActionPanelAdditionalButtons,
@@ -238,6 +273,7 @@ const _DashActionPanel = class _DashActionPanel extends React__default.PureCompo
         canEdit: this.props.canEdit,
         progress: this.props.progress,
         isLoadingEditMode: this.props.isLoadingEditMode,
+        showEditButton: this.isDashboardBreadcrumbEditingAccessible(),
         onEditClick: this.props.handlerEditClick,
         onAccessClick: this.openDialogAccess,
         entryDialoguesRef: this.props.entryDialoguesRef,

package/ui/units/dash/components/DashActionPanel/ViewControls/ViewControls.d.ts

@@ -4,6 +4,7 @@ type ViewControlsProps = {
     canEdit: boolean;
     progress: boolean;
     isLoadingEditMode: boolean;
+    showEditButton?: boolean;
     onEditClick: () => void;
     onAccessClick: () => void;
     entryDialoguesRef: React.RefObject<EntryDialogues>;

package/ui/units/dash/components/DashActionPanel/ViewControls/ViewControls.js

@@ -13,6 +13,7 @@ const ViewControls = (props) => {
     canEdit,
     progress,
     isLoadingEditMode,
+    showEditButton = true,
     onEditClick,
     onAccessClick,
     entryDialoguesRef,
@@ -33,7 +34,7 @@ const ViewControls = (props) => {
       }
     ),
     /* @__PURE__ */ jsx(EntryDialogues, { ref: entryDialoguesRef }),
-    canEdit && !DL.IS_MOBILE && /* @__PURE__ */ jsx(
+    showEditButton && canEdit && !DL.IS_MOBILE && /* @__PURE__ */ jsx(
       Button,
       {
         view: "normal",

package/ui/units/dash/store/utils.js

@@ -8,6 +8,7 @@ import "../../../utils/index.js";
 import { Mode, DASHKIT_STATE_VERSION } from "../modules/constants.js";
 import { getLocation } from "../../../navigation/router.js";
 import { URL_QUERY, DL } from "../../../constants/common.js";
+import { normalizeDestination } from "../../../../shared/modules/entry.js";
 import Utils from "../../../utils/utils.js";
 import { EntryScope } from "../../../../shared/types/common.js";
 const storeI18n = I18n.keyset("dash.store.view");
@@ -17,7 +18,7 @@ const getFakeDashEntry = (workbookId) => {
   const { counter, id: newTabId } = generateUniqId({ salt, counter: 0, ids: [] });
   const searchParams = getLocation().params();
   const searchCurrentPath = searchParams.get(URL_QUERY.CURRENT_PATH);
-  const path = searchCurrentPath || DL.USER_FOLDER;
+  const path = normalizeDestination(searchCurrentPath || DL.USER_FOLDER);
   const initialKey = `${path}${dashCreateI18n("label_default-name")}`;
   const data = {
     tabs: [

package/ui/units/ql/containers/QL/QLActionPanel/QLActionPanel.js

@@ -11,10 +11,12 @@ import { isDraftVersion } from "../../../../../utils/revisions.js";
 import "../../../../../index.js";
 import ActionPanel from "../../../../../components/ActionPanel/ActionPanel.js";
 import { ChartSaveControls } from "../../../../../components/ActionPanel/components/ChartSaveControls/ChartSaveControl.js";
+import "../../../../../navigation/index.js";
 import { registry } from "../../../../../registry/index.js";
 import { openDialogSaveDraftChartAsActualConfirm } from "../../../../../store/actions/dialog.js";
 import { resetEditHistoryUnit, addEditHistoryPoint } from "../../../../../store/actions/editHistory.js";
-import { reloadRevisionsOnSave } from "../../../../../store/actions/entryContent.js";
+import { setIsRenameWithoutReload, reloadRevisionsOnSave } from "../../../../../store/actions/entryContent.js";
+import { selectIsRenameWithoutReload } from "../../../../../store/selectors/entryContent.js";
 import DialogSettings from "../../../components/Dialogs/Settings/Settings.js";
 import { QL_EDIT_HISTORY_UNIT_ID } from "../../../constants/index.js";
 import { prepareChartDataBeforeSave } from "../../../modules/helpers.js";
@@ -25,6 +27,7 @@ import SvgMonitoring from "../../../../../assets/icons/monitoring.svg.js";
 /* empty css                   */
 import { getValid, getConnection, getExtraSettings, getPreviewData, getEntry } from "../../../store/selectors/ql.js";
 import { Feature } from "../../../../../../shared/types/feature.js";
+import { useRouter } from "../../../../../navigation/router.js";
 import Utils from "../../../../../utils/utils.js";
 import { EntryDialogName } from "../../../../../components/EntryDialogues/EntryDialogues.js";
 import { EntryDialogResolveStatus } from "../../../../../components/EntryDialogues/constants.js";
@@ -42,6 +45,7 @@ const QLActionPanel = (props) => {
   const redirectUrl = useSelector(getRedirectUrl);
   const previewData = useSelector(getPreviewData);
   const entry = useSelector(getEntry);
+  const isRenameWithoutReload = useSelector(selectIsRenameWithoutReload);
   const canEdit = !(entry && entry.permissions && entry.permissions.edit === false);
   const isCurrentRevisionActual = entry?.revId && entry?.revId === entry?.publishedId;
   const isNewChart = typeof entry?.fake !== "undefined" && entry?.fake;
@@ -49,17 +53,18 @@ const QLActionPanel = (props) => {
   const { QlActionPanelExtension } = registry.ql.components.getAll();
   const enablePublish = entry && isEnabledFeature(Feature.EnablePublishEntry) && !entry.fake;
   const dispatch = useDispatch();
+  const router = useRouter();
   const [dialogNoRightsVisible, setDialogNoRightsVisible] = React__default.useState(false);
   const [dialogSettingsVisible, setDialogSettingsVisible] = React__default.useState(false);
   const qlState = useSelector((state) => state.ql);
   const wizardState = useSelector((state) => state.wizard);
   const handleBeforeunload = React__default.useCallback(
     (event) => {
-      if (!entryNotChanged) {
+      if (!entryNotChanged && !isRenameWithoutReload) {
         event.returnValue = true;
       }
     },
-    [entryNotChanged]
+    [entryNotChanged, isRenameWithoutReload]
   );
   React__default.useEffect(() => {
     window.removeEventListener("beforeunload", handleBeforeunload);
@@ -91,12 +96,21 @@ const QLActionPanel = (props) => {
         icon: /* @__PURE__ */ jsx(Icon, { data: SvgMonitoring, width: 16, height: 16 }),
         id: "sql-to-monitoring",
         action: () => {
-          window.open(redirectUrl, "_blank");
+          const url = new URL(redirectUrl, window.location.origin);
+          if (url.origin === window.location.origin) {
+            router.openTab({
+              pathname: url.pathname,
+              search: url.search,
+              hash: url.hash
+            });
+            return;
+          }
+          window.open(url.toString(), "_blank");
         }
       });
     }
     return items;
-  }, [redirectUrl]);
+  }, [redirectUrl, router]);
   const defaultChartName = React__default.useMemo(() => {
     if (connection === null) {
       return "";
@@ -127,7 +141,12 @@ const QLActionPanel = (props) => {
       if (!result || !result.data || result.status === EntryDialogResolveStatus.Close) {
         return;
       }
-      window.history.replaceState({}, document.title, `/ql/${result.data.entryId}`);
+      dispatch(setIsRenameWithoutReload(true));
+      try {
+        router.replace({ pathname: `/ql/${result.data.entryId}` });
+      } finally {
+        dispatch(setIsRenameWithoutReload(false));
+      }
       result.data.data = {
         shared: JSON.parse(result.data.data.shared)
       };
@@ -152,6 +171,7 @@ const QLActionPanel = (props) => {
       entryDialoguesRef,
       defaultChartName,
       qlState,
+      router,
       wizardState
     ]
   );

package/ui/units/wizard/actions/widget.js

@@ -2,6 +2,7 @@ import { WIZARD_DATASET_ID_PARAMETER_KEY } from "../../../constants/misc.js";
 import { CHART_SETTINGS } from "../../../constants/visualizations/index.js";
 import "../../../navigation/index.js";
 import { saveWidget } from "../../../store/actions/chartWidget.js";
+import { setIsRenameWithoutReload } from "../../../store/actions/entryContent.js";
 import { updateClientChartsConfig } from "./preview.js";
 import { mapClientConfigToChartsConfig } from "../utils/mappers/mapClientToChartsConfig.js";
 import { removeUrlParameters } from "../utils/wizard.js";
@@ -32,7 +33,12 @@ function receiveWidgetAndPrepareMetadata({
         pathname += entryId;
       }
       if (!location.pathname.includes(entryId)) {
-        router.replace({ pathname });
+        dispatch(setIsRenameWithoutReload(true));
+        try {
+          router.replace({ pathname });
+        } finally {
+          dispatch(setIsRenameWithoutReload(false));
+        }
       }
     }
     if (error) {

package/ui/units/wizard/containers/Wizard/Wizard.js

@@ -23,6 +23,7 @@ import { registry } from "../../../../registry/index.js";
 import { openDialogSaveDraftChartAsActualConfirm } from "../../../../store/actions/dialog.js";
 import { addEditHistoryPoint, resetEditHistoryUnit, initEditHistoryUnit } from "../../../../store/actions/editHistory.js";
 import { reloadRevisionsOnSave, cleanRevisions, setRevisionsMode } from "../../../../store/actions/entryContent.js";
+import { selectIsRenameWithoutReload } from "../../../../store/selectors/entryContent.js";
 import { RevisionsMode } from "../../../../store/typings/entryContent.js";
 import "../../../../utils/index.js";
 import { isDraft, isEditMode } from "../../../dash/store/selectors/dashTypedSelectors.js";
@@ -67,9 +68,9 @@ class Wizard extends React__default.Component {
     super(props);
     this.chartKitRef = React__default.createRef();
     this.unloadConfirmation = (event) => {
-      const { previewHash, widgetHash, initialPreviewHash } = this.props;
+      const { previewHash, widgetHash, initialPreviewHash, isRenameWithoutReload } = this.props;
       const widgetChanged = previewHash !== widgetHash && previewHash !== initialPreviewHash;
-      if (widgetChanged) {
+      if (widgetChanged && !isRenameWithoutReload) {
         const message = i18n("wizard", "toast_unsaved");
         (event || window.event).returnValue = message;
         return message;
@@ -478,7 +479,8 @@ const mapStateToProps = (state, ownProps) => {
     isParentDashWasChanged: isDraft(state) && isEditMode(state),
     initialPreviewHash: selectInitialPreviewHash(state),
     wizardState: state.wizard,
-    description: selectPreviewDescription(state)
+    description: selectPreviewDescription(state),
+    isRenameWithoutReload: selectIsRenameWithoutReload(state)
   };
 };
 const mapDispatchToProps = (dispatch) => {

package/ui/units/workbooks/components/RenameEntryDialog/RenameEntryDialog.js

@@ -4,7 +4,9 @@ import { Dialog, TextInput } from "@gravity-ui/uikit";
 import block from "bem-cn-lite";
 import { I18n } from "../../../../../i18n/index.js";
 import { useDispatch, useSelector } from "react-redux";
+import { getEntryNameInputError } from "../../../../utils/errors/errorByCode.js";
 import DialogManager from "../../../../components/DialogManager/DialogManager.js";
+import { showToast } from "../../../../store/actions/toaster.js";
 import { renameEntry } from "../../store/actions/index.js";
 import { selectRenameEntryIsLoading } from "../../store/selectors/index.js";
 /* empty css                       */
@@ -15,21 +17,54 @@ const RenameEntryDialog = React__default.memo(({ open, data, onClose }) => {
   const dispatch = useDispatch();
   const isLoading = useSelector(selectRenameEntryIsLoading);
   const [newNameValue, setNewNameValue] = React__default.useState(data.name);
+  const [inputError, setInputError] = React__default.useState(false);
   const textInputControlRef = React__default.useRef(null);
-  const handleApply = React__default.useCallback(() => {
-    dispatch(
-      renameEntry({
-        entryId: data.entryId,
-        name: newNameValue,
-        updateInline: true
-      })
-    ).then(() => {
-      onClose();
-    });
+  React__default.useEffect(() => {
+    if (open) {
+      setNewNameValue(data.name);
+      setInputError(false);
+    }
+  }, [data.name, open]);
+  const handleApply = React__default.useCallback(async () => {
+    const name = newNameValue.trim();
+    try {
+      const renamedEntry = await dispatch(
+        renameEntry({
+          entryId: data.entryId,
+          name,
+          updateInline: true
+        })
+      );
+      if (renamedEntry) {
+        onClose();
+      }
+    } catch (error) {
+      const errorMessage = getEntryNameInputError(
+        error,
+        i18n("label_entry-name-already-exists")
+      );
+      if (errorMessage) {
+        setInputError(errorMessage);
+        return;
+      }
+      dispatch(
+        showToast({
+          title: error.message,
+          name: "RenameEntryDialogFailed",
+          error,
+          withReport: true
+        })
+      );
+    }
   }, [data.entryId, dispatch, newNameValue, onClose]);
+  const handleInputUpdate = React__default.useCallback((value) => {
+    setNewNameValue(value);
+    setInputError(false);
+  }, []);
   const propsButtonApply = React__default.useMemo(() => {
+    const normalizedValue = newNameValue.trim();
     return {
-      disabled: !newNameValue || newNameValue === data.name
+      disabled: !normalizedValue || normalizedValue === data.name
     };
   }, [data.name, newNameValue]);
   return /* @__PURE__ */ jsxs(
@@ -49,7 +84,8 @@ const RenameEntryDialog = React__default.memo(({ open, data, onClose }) => {
             {
               value: newNameValue,
               controlRef: textInputControlRef,
-              onUpdate: setNewNameValue
+              onUpdate: handleInputUpdate,
+              error: inputError
             }
           )
         ] }),

package/ui/units/workbooks/store/actions/index.d.ts

@@ -164,7 +164,7 @@ export declare const renameEntry: ({ entryId, name, updateInline, }: {
     entryId: string;
     name: string;
     updateInline: boolean;
-}) => (dispatch: WorkbooksDispatch) => CancellablePromise<RenameEntryResponse | null>;
+}) => (dispatch: WorkbooksDispatch) => CancellablePromise<RenameEntryResponse>;
 type ChangeFavoriteEntryLoadingAction = {
     type: typeof CHANGE_FAVORITE_ENTRY_LOADING;
 };

package/ui/units/workbooks/store/actions/index.js

@@ -319,18 +319,12 @@ const renameEntry = ({
     }).catch((error) => {
       if (!getSdk().sdk.isCancel(error)) {
         logger.logError("workbooks/renameEntry failed", error);
-        dispatch(
-          showToast({
-            title: error.message,
-            error
-          })
-        );
       }
       dispatch({
         type: RENAME_ENTRY_FAILED,
         error
       });
-      return null;
+      throw error;
     });
   };
 };

package/ui/utils/errors/errorByCode.d.ts

@@ -14,4 +14,5 @@ interface EntryIsLockedError extends Error {
 export declare function isEntryIsLockedError(error: DataLensApiError): error is EntryIsLockedError;
 export declare function getLoginOrIdFromLockedError(error: EntryIsLockedError): string;
 export declare function isEntryAlreadyExists(error: DataLensApiError): boolean;
+export declare function getEntryNameInputError(error: DataLensApiError, duplicateNameErrorText: string): string | null;
 export {};