@retailcrm/datalens-ui 0.2.4 → 0.2.5

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);
@@ -127,7 +132,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 +162,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 {};

package/ui/utils/errors/errorByCode.js

@@ -1,3 +1,4 @@
+import { I18n } from "../../../i18n/index.js";
 import "../../../shared/index.js";
 import { parseError } from "./parse.js";
 import { ErrorCode } from "../../../shared/constants/error-codes.js";
@@ -14,7 +15,103 @@ function isEntryAlreadyExists(error) {
   }
   return false;
 }
+const NON_INPUT_ENTRY_ERROR_CODES = /* @__PURE__ */ new Set([
+  ErrorCode.EntryIsLocked,
+  ErrorCode.UsAccessDenied,
+  ErrorCode.EntryForbidden
+]);
+const validationI18n = I18n.keyset("validation");
+const GENERIC_VALIDATION_MESSAGES = /* @__PURE__ */ new Set(["validation error", "validation_error"]);
+const VALIDATION_TEXT_KEYS = [
+  "validationErrors",
+  "validationError",
+  "errors",
+  "error",
+  "message",
+  "description",
+  "detail",
+  "reason"
+];
+function normalizeErrorText(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : null;
+}
+function normalizeEntryNameValidationText(value) {
+  const withoutFieldPrefix = value.replace(/^data\.name\s+/i, "").trim();
+  const isSlashValidation = /contain/i.test(withoutFieldPrefix) && /symbol/i.test(withoutFieldPrefix) && withoutFieldPrefix.includes("/");
+  if (isSlashValidation) {
+    return validationI18n("label_validation-slash_error");
+  }
+  const isSymbolsValidation = /should start and end with/i.test(withoutFieldPrefix) && /can contain only symbols/i.test(withoutFieldPrefix);
+  if (isSymbolsValidation) {
+    return validationI18n("label_validation-symbols_error");
+  }
+  return withoutFieldPrefix;
+}
+function isGenericValidationMessage(value) {
+  return GENERIC_VALIDATION_MESSAGES.has(value.toLowerCase());
+}
+function getValidationTextFromUnknown(value) {
+  const stringValue = normalizeErrorText(value);
+  if (stringValue) {
+    return isGenericValidationMessage(stringValue) ? null : normalizeEntryNameValidationText(stringValue);
+  }
+  if (Array.isArray(value)) {
+    const messages = value.map((item) => getValidationTextFromUnknown(item)).filter((item) => Boolean(item));
+    if (messages.length === 0) {
+      return null;
+    }
+    return Array.from(new Set(messages)).join("; ");
+  }
+  if (!value || typeof value !== "object") {
+    return null;
+  }
+  const record = value;
+  for (const key of VALIDATION_TEXT_KEYS) {
+    if (key in record) {
+      const text = getValidationTextFromUnknown(record[key]);
+      if (text) {
+        return text;
+      }
+    }
+  }
+  for (const nestedValue of Object.values(record)) {
+    const text = getValidationTextFromUnknown(nestedValue);
+    if (text) {
+      return text;
+    }
+  }
+  return null;
+}
+function getDetailsValidationText(details) {
+  return getValidationTextFromUnknown(details);
+}
+function getEntryNameInputError(error, duplicateNameErrorText) {
+  if (isEntryAlreadyExists(error)) {
+    return duplicateNameErrorText;
+  }
+  const { code, message, status, details } = parseError(error);
+  const normalizedMessage = normalizeErrorText(message);
+  const detailsValidationText = getDetailsValidationText(details);
+  const messageForInput = detailsValidationText || (normalizedMessage && !isGenericValidationMessage(normalizedMessage) ? normalizeEntryNameValidationText(normalizedMessage) : null);
+  if (!messageForInput) {
+    return null;
+  }
+  if (code && NON_INPUT_ENTRY_ERROR_CODES.has(code)) {
+    return null;
+  }
+  if (!code) {
+    const isValidationStatus2 = status === 400 || status === 409 || status === 422;
+    return isValidationStatus2 ? messageForInput : null;
+  }
+  const isUsRelatedError = code.startsWith("ERR.US.") || code.startsWith("ERR.DS_API.US.");
+  if (isUsRelatedError) {
+    return messageForInput;
+  }
+  const isValidationStatus = status === 400 || status === 409 || status === 422;
+  return isValidationStatus ? messageForInput : null;
+}
 export {
+  getEntryNameInputError,
   getLoginOrIdFromLockedError,
   isEntryAlreadyExists,
   isEntryIsLockedError