From 16350b4d50b988dbe374c3752dc4a88f5d4df242 Mon Sep 17 00:00:00 2001
From: gopienkonikita <nikita.gopienko@onlyoffice.com>
Date: Fri, 3 May 2024 13:08:38 +0300
Subject: [PATCH] Web: Shared: FilesSelector: fixed title

---
 packages/client/src/HOCs/withContent.js               |  8 ++++++--
 .../client/src/components/GlobalEvents/CreateEvent.js |  2 +-
 .../client/src/components/GlobalEvents/RenameEvent.js |  2 +-
 packages/client/src/helpers/filesUtils.js             |  7 -------
 .../shared/selectors/Files/FilesSelector.utils.ts     |  3 ++-
 packages/shared/utils/index.ts                        | 11 +++++++++++
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/HOCs/withContent.js b/packages/client/src/HOCs/withContent.js
index 0c018b4189..ba491dfc09 100644
--- a/packages/client/src/HOCs/withContent.js
+++ b/packages/client/src/HOCs/withContent.js
@@ -33,11 +33,15 @@ import {
   ShareAccessRights,
 } from "@docspace/shared/enums";
 //import { combineUrl } from "@docspace/shared/utils/combineUrl";
-import { getCorrectDate, getCookie } from "@docspace/shared/utils";
+import {
+  getCorrectDate,
+  getCookie,
+  getTitleWithoutExtension,
+} from "@docspace/shared/utils";
 import { LANGUAGE } from "@docspace/shared/constants";
 import config from "PACKAGE_FILE";
 //import EditingWrapperComponent from "../components/EditingWrapperComponent";
-import { getTitleWithoutExtension } from "SRC_DIR/helpers/filesUtils";
+
 //import { getDefaultFileName } from "@docspace/client/src/helpers/filesUtils";
 //import ItemIcon from "../components/ItemIcon";
 
diff --git a/packages/client/src/components/GlobalEvents/CreateEvent.js b/packages/client/src/components/GlobalEvents/CreateEvent.js
index 9bd3c0103b..43381768cf 100644
--- a/packages/client/src/components/GlobalEvents/CreateEvent.js
+++ b/packages/client/src/components/GlobalEvents/CreateEvent.js
@@ -34,10 +34,10 @@ import { combineUrl } from "@docspace/shared/utils/combineUrl";
 import { setEncryptionAccess } from "SRC_DIR/helpers/desktop";
 import config from "PACKAGE_FILE";
 
-import { getTitleWithoutExtension } from "SRC_DIR/helpers/filesUtils";
 import { getDefaultFileName } from "@docspace/client/src/helpers/filesUtils";
 
 import Dialog from "./sub-components/Dialog";
+import { getTitleWithoutExtension } from "@docspace/shared/utils";
 
 const CreateEvent = ({
   id,
diff --git a/packages/client/src/components/GlobalEvents/RenameEvent.js b/packages/client/src/components/GlobalEvents/RenameEvent.js
index 2518b0e727..06fa928005 100644
--- a/packages/client/src/components/GlobalEvents/RenameEvent.js
+++ b/packages/client/src/components/GlobalEvents/RenameEvent.js
@@ -29,7 +29,7 @@ import { inject, observer } from "mobx-react";
 import { useTranslation } from "react-i18next";
 import { toastr } from "@docspace/shared/components/toast";
 import Dialog from "./sub-components/Dialog";
-import { getTitleWithoutExtension } from "SRC_DIR/helpers/filesUtils";
+import { getTitleWithoutExtension } from "@docspace/shared/utils";
 
 const RenameEvent = ({
   type,
diff --git a/packages/client/src/helpers/filesUtils.js b/packages/client/src/helpers/filesUtils.js
index daa6498917..bd91ce3459 100644
--- a/packages/client/src/helpers/filesUtils.js
+++ b/packages/client/src/helpers/filesUtils.js
@@ -226,10 +226,3 @@ export const connectedCloudsTypeIcon = (key) => {
     default:
   }
 };
-
-export const getTitleWithoutExtension = (item, fromTemplate) => {
-  const titleWithoutExst = item.title.split(".").slice(0, -1).join(".");
-  return titleWithoutExst && item.fileExst && !fromTemplate
-    ? titleWithoutExst
-    : item.title;
-};
diff --git a/packages/shared/selectors/Files/FilesSelector.utils.ts b/packages/shared/selectors/Files/FilesSelector.utils.ts
index 7c9a291902..a8af4ccaae 100644
--- a/packages/shared/selectors/Files/FilesSelector.utils.ts
+++ b/packages/shared/selectors/Files/FilesSelector.utils.ts
@@ -30,6 +30,7 @@ import { TRoom } from "../../api/rooms/types";
 import { getIconPathByFolderType } from "../../utils/common";
 import { iconSize32 } from "../../utils/image-helpers";
 import { DEFAULT_FILE_EXTS } from "./FilesSelector.constants";
+import { getTitleWithoutExtension } from "../../utils";
 
 export const convertFoldersToItems: (
   folders: TFolder[],
@@ -87,7 +88,7 @@ export const convertFilesToItems: (
     const { id, title, security, folderId, rootFolderType, fileExst } = file;
 
     const icon = getIcon(fileExst || DEFAULT_FILE_EXTS);
-    const label = title.replace(fileExst, "") || fileExst;
+    const label = getTitleWithoutExtension(file, false);
 
     return {
       id,
diff --git a/packages/shared/utils/index.ts b/packages/shared/utils/index.ts
index a1242bd0e0..7c41ffc1a8 100644
--- a/packages/shared/utils/index.ts
+++ b/packages/shared/utils/index.ts
@@ -76,6 +76,7 @@ import {
   getLogoUrl,
 } from "./common";
 import { DeviceType } from "../enums";
+import { TFile } from "../api/files/types";
 
 export {
   isBetaLanguage,
@@ -153,3 +154,13 @@ export const getDeviceTypeByWidth = (width: number): DeviceType => {
 
   return DeviceType.desktop;
 };
+
+export const getTitleWithoutExtension = (
+  item: TFile,
+  fromTemplate: boolean,
+) => {
+  const titleWithoutExst = item.title.split(".").slice(0, -1).join(".");
+  return titleWithoutExst && item.fileExst && !fromTemplate
+    ? titleWithoutExst
+    : item.title;
+};