IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace-client into feature/active-sessions

Browse Source
This commit is contained in:
Elyor Djalilov 2024-01-16 13:08:20 +05:00
commit 03b040f6b3
487 changed files with 7590 additions and 6782 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/scripts/minify-common-locales.js
View File

@ -1,6 +1,6 @@
const { join } = require("path");
const { readdirSync, readFileSync, writeFileSync } = require("fs");
const minifyJson = require("../../packages/common/utils/minifyJson.js");
const minifyJson = require("../../packages/shared/utils/minifyJson.js");
const localesDir = join(
__dirname,

2
packages/client/scripts/buildTranslations.js
View File

@ -1,5 +1,5 @@
const path = require("path");
const beforeBuild = require("@docspace/common/utils/beforeBuild");
const beforeBuild = require("@docspace/shared/utils/beforeBuild");
beforeBuild(
[

2
packages/client/src/App.js
View File

@ -1,4 +1,4 @@
//import "@docspace/common/utils/wdyr";
// import "@docspace/shared/utils/wdyr";
import React from "react";
import { RouterProvider } from "react-router-dom";

4
packages/client/src/Client.jsx
View File

@ -8,8 +8,8 @@ import {
updateTempContent,
showLoader,
hideLoader,
} from "@docspace/common/utils";
import { regDesktop } from "@docspace/common/desktop";
} from "@docspace/shared/utils/common";
import { regDesktop } from "@docspace/shared/utils/desktop";
import { toastr } from "@docspace/shared/components/toast";

2
packages/client/src/DocspaceLogo/index.js
View File

@ -3,7 +3,7 @@ import styled from "styled-components";
import { ReactSVG } from "react-svg";
import { mobile } from "@docspace/shared/utils";
import { inject, observer } from "mobx-react";
import { getLogoFromPath } from "@docspace/common/utils";
import { getLogoFromPath } from "@docspace/shared/utils";
const StyledWrapper = styled.div`
.logo-wrapper {

4
packages/client/src/HOCs/withBadges.js
View File

@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { ShareAccessRights, FileStatus } from "@docspace/common/constants";
import { combineUrl } from "@docspace/common/utils";
import { ShareAccessRights, FileStatus } from "@docspace/shared/enums";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import Badges from "../components/Badges";
import config from "PACKAGE_FILE";

4
packages/client/src/HOCs/withContent.js
View File

@ -5,8 +5,8 @@ import {
// FileAction,
FileStatus,
ShareAccessRights,
} from "@docspace/common/constants";
//import { combineUrl } from "@docspace/common/utils";
} from "@docspace/shared/enums";
//import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { getCorrectDate, getCookie } from "@docspace/shared/utils";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";

2
packages/client/src/HOCs/withFileActions.js
View File

@ -1,7 +1,7 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
export default function withFileActions(WrappedFileItem) {
class WithFileActions extends React.Component {

4
packages/client/src/HOCs/withHotkeys.js
View File

@ -2,10 +2,10 @@ import { useEffect, useState } from "react";
import { useHotkeys } from "react-hotkeys-hook";
import { observer, inject } from "mobx-react";
import { useNavigate } from "react-router-dom";
import { Events } from "@docspace/common/constants";
import { Events } from "@docspace/shared/enums";
import { toastr } from "@docspace/shared/components/toast";
import throttle from "lodash/throttle";
import { checkDialogsOpen } from "@docspace/common/utils/checkDialogsOpen";
import { checkDialogsOpen } from "@docspace/shared/utils/checkDialogsOpen";
const withHotkeys = (Component) => {
const WithHotkeys = (props) => {

2
packages/client/src/Hooks/useViewEffect.ts
View File

@ -1,6 +1,6 @@
import { useEffect, useContext } from "react";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
//@ts-ignore
import { isTablet, isMobile, Context } from "@docspace/shared/utils";
import { isMobile as isMobileDevice } from "react-device-detect";

11
packages/client/src/Shell.jsx
View File

@ -11,7 +11,8 @@ import { ThemeProvider } from "@docspace/shared/components/theme-provider";
import { SnackBar } from "@docspace/shared/components/snackbar";
import { Portal } from "@docspace/shared/components/portal";
import { getLogoFromPath, updateTempContent } from "@docspace/common/utils";
import { updateTempContent } from "@docspace/shared/utils/common";
import { getLogoFromPath } from "@docspace/shared/utils";
import store from "client/store";
@ -21,15 +22,15 @@ import i18n from "./i18n";
import moment from "moment-timezone";
//import ReactSmartBanner from "./components/SmartBanner";
import { useThemeDetector } from "@docspace/common/utils/useThemeDetector";
import { useThemeDetector } from "@docspace/shared/hooks/useThemeDetector";
import { isMobile, isIOS, isFirefox } from "react-device-detect";
import IndicatorLoader from "./components/IndicatorLoader";
import DialogsWrapper from "./components/dialogs/DialogsWrapper";
import MainBar from "./components/MainBar";
import indexedDbHelper from "@docspace/common/utils/indexedDBHelper";
import { DeviceType, IndexedDBStores } from "@docspace/common/constants";
import { getRestoreProgress } from "@docspace/common/api/portal";
import indexedDbHelper from "@docspace/shared/utils/indexedDBHelper";
import { DeviceType, IndexedDBStores } from "@docspace/shared/enums";
import { getRestoreProgress } from "@docspace/shared/api/portal";
import { useTheme } from "styled-components";
const Shell = ({ items = [], page = "home", ...rest }) => {

2
packages/client/src/bootstrap.js vendored
View File

@ -1,7 +1,7 @@
import React from "react";
import { createRoot } from "react-dom/client";
import App from "./App";
//import { registerSW } from "@docspace/common/sw/helper";
//import { registerSW } from "@docspace/shared/sw/helper";
const container = document.getElementById("root");
const root = createRoot(container);

4
packages/client/src/components/Article/Body/AccountsItem.js
View File

@ -2,8 +2,8 @@
import { inject, observer } from "mobx-react";
import { withTranslation } from "react-i18next";
import { PageType } from "@docspace/common/constants";
import { getCatalogIconUrlByType } from "@docspace/common/utils/catalogIcon.helper";
import { PageType } from "@docspace/shared/enums";
import { getCatalogIconUrlByType } from "@docspace/shared/utils/catalogIconHelper";
import { ArticleItem } from "@docspace/shared/components/article-item";

2
packages/client/src/components/Article/Body/BonusItem.js
View File

@ -3,7 +3,7 @@ import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
import { ArticleItem } from "@docspace/shared/components/article-item";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { useNavigate } from "react-router-dom";
import GiftReactSvgUrl from "PUBLIC_DIR/images/gift.react.svg?url";

8
packages/client/src/components/Article/Body/Items.js
View File

@ -7,10 +7,10 @@ import { withTranslation } from "react-i18next";
import {
FolderType,
ShareAccessRights,
FolderNames,
DeviceType,
} from "@docspace/common/constants";
import { getCatalogIconUrlByType } from "@docspace/common/utils/catalogIcon.helper";
} from "@docspace/shared/enums";
import { FOLDER_NAMES } from "@docspace/shared/constants";
import { getCatalogIconUrlByType } from "@docspace/shared/utils/catalogIconHelper";
import { ArticleItem } from "@docspace/shared/components/article-item";
import DragAndDrop from "@docspace/shared/components/drag-and-drop/DragAndDrop";
@ -312,7 +312,7 @@ const Items = ({
showBadge={showBadge}
labelBadge={labelBadge}
iconBadge={iconBadge}
folderId={`document_catalog-${FolderNames[item.rootFolderType]}`}
folderId={`document_catalog-${FOLDER_NAMES[item.rootFolderType]}`}
/>
);
});

8
packages/client/src/components/Article/Body/index.js
View File

@ -5,13 +5,13 @@ import { withTranslation } from "react-i18next";
import { useNavigate, useLocation } from "react-router-dom";
import { DeviceType, RoomSearchArea } from "@docspace/common/constants";
import { DeviceType, RoomSearchArea } from "@docspace/shared/enums";
import Items from "./Items";
import { tablet } from "@docspace/shared/utils";
import FilesFilter from "@docspace/common/api/files/filter";
import RoomsFilter from "@docspace/common/api/rooms/filter";
import AccountsFilter from "@docspace/common/api/people/filter";
import FilesFilter from "@docspace/shared/api/files/filter";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
import AccountsFilter from "@docspace/shared/api/people/filter";
import Banner from "./Banner";

4
packages/client/src/components/Article/MainButton/index.js
View File

@ -28,11 +28,11 @@ import { useNavigate, useLocation } from "react-router-dom";
import MobileView from "./MobileView";
import { Events, EmployeeType, DeviceType } from "@docspace/common/constants";
import { Events, EmployeeType, DeviceType } from "@docspace/shared/enums";
import styled, { css } from "styled-components";
import { resendInvitesAgain } from "@docspace/common/api/people";
import { resendInvitesAgain } from "@docspace/shared/api/people";
import { getCorrectFourValuesStyle } from "@docspace/shared/utils";
const StyledButton = styled(Button)`

2
packages/client/src/components/Badges.js
View File

@ -20,7 +20,7 @@ import {
FileStatus,
RoomsType,
ShareAccessRights,
} from "@docspace/common/constants";
} from "@docspace/shared/enums";
import { Base } from "@docspace/shared/themes";
import { isTablet, isDesktop, size, classNames } from "@docspace/shared/utils";

4
packages/client/src/components/EmptyContainer/EmptyFilterContainer.js
View File

@ -6,8 +6,8 @@ import { useNavigate, useLocation } from "react-router-dom";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import EmptyContainer from "./EmptyContainer";
import FilesFilter from "@docspace/common/api/files/filter";
import RoomsFilter from "@docspace/common/api/rooms/filter";
import FilesFilter from "@docspace/shared/api/files/filter";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
import { IconButton } from "@docspace/shared/components/icon-button";
import { Link } from "@docspace/shared/components/link";

2
packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js
View File

@ -9,7 +9,7 @@ import { useNavigate } from "react-router-dom";
import EmptyContainer from "./EmptyContainer";
import { Link } from "@docspace/shared/components/link";
import { IconButton } from "@docspace/shared/components/icon-button";
import RoomsFilter from "@docspace/common/api/rooms/filter";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
import { getCategoryUrl } from "SRC_DIR/helpers/utils";
import { CategoryType } from "SRC_DIR/helpers/constants";

6
packages/client/src/components/EmptyContainer/RootFolderContainer.js
View File

@ -4,7 +4,7 @@ import PlusSvgUrl from "PUBLIC_DIR/images/plus.svg?url";
import RoomsReactSvgUrl from "PUBLIC_DIR/images/rooms.react.svg?url";
import { useNavigate, useLocation } from "react-router-dom";
import { FolderType, RoomSearchArea } from "@docspace/common/constants";
import { FolderType, RoomSearchArea } from "@docspace/shared/enums";
import { inject, observer } from "mobx-react";
import { withTranslation, Trans } from "react-i18next";
import EmptyContainer from "./EmptyContainer";
@ -13,8 +13,8 @@ import { Box } from "@docspace/shared/components/box";
import { Text } from "@docspace/shared/components/text";
import { IconButton } from "@docspace/shared/components/icon-button";
import RoomsFilter from "@docspace/common/api/rooms/filter";
import FilesFilter from "@docspace/common/api/files/filter";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
import FilesFilter from "@docspace/shared/api/files/filter";
import { getCategoryUrl } from "SRC_DIR/helpers/utils";
import { CategoryType } from "SRC_DIR/helpers/constants";

2
packages/client/src/components/EmptyContainer/index.js
View File

@ -4,7 +4,7 @@ import { observer, inject } from "mobx-react";
import RootFolderContainer from "./RootFolderContainer";
import EmptyFilterContainer from "./EmptyFilterContainer";
import EmptyFolderContainer from "./EmptyFolderContainer";
import { Events } from "@docspace/common/constants";
import { Events } from "@docspace/shared/enums";
import RoomNoAccessContainer from "./RoomNoAccessContainer";
const linkStyles = {

6
packages/client/src/components/EmptyContainer/sub-components/CommonButtons.js
View File

@ -10,9 +10,9 @@ import { Link } from "@docspace/shared/components/link";
import { Box } from "@docspace/shared/components/box";
import { Text } from "@docspace/shared/components/text";
import { FolderType, RoomSearchArea } from "@docspace/common/constants";
import RoomsFilter from "@docspace/common/api/rooms/filter";
import FilesFilter from "@docspace/common/api/files/filter";
import { FolderType, RoomSearchArea } from "@docspace/shared/enums";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
import FilesFilter from "@docspace/shared/api/files/filter";
import { getCategoryUrl, getCategoryType } from "SRC_DIR/helpers/utils";
import { CategoryType } from "SRC_DIR/helpers/constants";

2
packages/client/src/components/FilesPanels/index.js
View File

@ -39,7 +39,7 @@ import ArchiveDialog from "../dialogs/ArchiveDialog";
import RestoreRoomDialog from "../dialogs/RestoreRoomDialog";
import PreparationPortalDialog from "../dialogs/PreparationPortalDialog";
import FilesSelector from "../FilesSelector";
import { FilesSelectorFilterTypes } from "@docspace/common/constants";
import { FilesSelectorFilterTypes } from "@docspace/shared/enums";
import LeaveRoomDialog from "../dialogs/LeaveRoomDialog";
import ChangeRoomOwnerPanel from "../panels/ChangeRoomOwnerPanel";

8
packages/client/src/components/FilesSelector/helpers/useFilesHelper.ts
View File

@ -1,11 +1,11 @@
import React from "react";
// @ts-ignore
import { getFolder, getFolderInfo } from "@docspace/common/api/files";
import { getFolder, getFolderInfo } from "@docspace/shared/api/files";
// @ts-ignore
import FilesFilter from "@docspace/common/api/files/filter";
import FilesFilter from "@docspace/shared/api/files/filter";
// @ts-ignore
import { iconSize32 } from "@docspace/common/utils/image-helpers";
import { iconSize32 } from "@docspace/shared/utils/image-helpers";
import { PAGE_COUNT, defaultBreadCrumb } from "../utils";
@ -20,7 +20,7 @@ import {
FilesSelectorFilterTypes,
FilterType,
FolderType,
} from "@docspace/common/constants";
} from "@docspace/shared/enums";
//@ts-ignore
import { toastr } from "@docspace/shared/components/toast";

12
packages/client/src/components/FilesSelector/helpers/useRoomsHelper.ts
View File

@ -1,13 +1,13 @@
import React from "react";
// @ts-ignore
import { getRooms } from "@docspace/common/api/rooms";
import { getRooms } from "@docspace/shared/api/rooms";
// @ts-ignore
import RoomsFilter from "@docspace/common/api/rooms/filter";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
// @ts-ignore
import { RoomsType } from "@docspace/common/constants";
import { RoomsType } from "@docspace/shared/enums";
// @ts-ignore
import { iconSize32 } from "@docspace/common/utils/image-helpers";
import { iconSize32 } from "@docspace/shared/utils/image-helpers";
import { PAGE_COUNT, defaultBreadCrumb } from "../utils";
@ -92,8 +92,8 @@ const useRoomsHelper = ({
const filterValue = search
? search
: search === null
? ""
: searchValue || "";
? ""
: searchValue || "";
const page = startIndex / PAGE_COUNT;

6
packages/client/src/components/FilesSelector/helpers/useRootHelper.ts
View File

@ -1,8 +1,8 @@
import React from "react";
import { FolderType } from "@docspace/common/constants";
import { FolderType } from "@docspace/shared/enums";
// @ts-ignore
import { getFoldersTree } from "@docspace/common/api/files";
import { getFoldersTree } from "@docspace/shared/api/files";
import CatalogFolderReactSvgUrl from "PUBLIC_DIR/images/catalog.folder.react.svg?url";
import CatalogUserReactSvgUrl from "PUBLIC_DIR/images/catalog.user.react.svg?url";
@ -10,7 +10,7 @@ import CatalogUserReactSvgUrl from "PUBLIC_DIR/images/catalog.user.react.svg?url
import { useRootHelperProps, Item } from "../FilesSelector.types";
import { defaultBreadCrumb } from "../utils";
import { getCatalogIconUrlByType } from "@docspace/common/utils/catalogIcon.helper";
import { getCatalogIconUrlByType } from "@docspace/shared/utils/catalogIconHelper";
const useRootHelper = ({
setBreadCrumbs,

4
packages/client/src/components/FilesSelector/i18n.js
View File

@ -1,9 +1,9 @@
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
import Backend from "@docspace/common/utils/i18next-http-backend";
import Backend from "@docspace/shared/utils/i18next-http-backend";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";
import { getLtrLanguageForEditor } from "@docspace/common/utils";
import { getLtrLanguageForEditor } from "@docspace/shared/utils/common";
import { getCookie } from "@docspace/shared/utils";
import { loadLanguagePath } from "SRC_DIR/helpers/utils";
const newInstance = i18n.createInstance();

4
packages/client/src/components/FilesSelector/index.tsx
View File

@ -4,8 +4,8 @@ import { useTranslation } from "react-i18next";
// @ts-ignore
import Loaders from "@docspace/common/components/Loaders";
import { FolderType, RoomsType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/common/constants";
import { FolderType, RoomsType } from "@docspace/shared/enums";
import { DeviceType } from "@docspace/shared/enums";
import { Selector } from "@docspace/shared/components/selector";
import { Aside } from "@docspace/shared/components/aside";

2
packages/client/src/components/FilesSelector/utils.ts
View File

@ -1,4 +1,4 @@
import { FilesSelectorFilterTypes } from "@docspace/common/constants";
import { FilesSelectorFilterTypes } from "@docspace/shared/enums";
import { BreadCrumb, Security } from "./FilesSelector.types";
export const PAGE_COUNT = 100;

2
packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
View File

@ -7,7 +7,7 @@ import { ChangeUserTypeDialog } from "../dialogs";
import { toastr } from "@docspace/shared/components/toast";
import { Link } from "@docspace/shared/components/link";
import { Text } from "@docspace/shared/components/text";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
const ChangeUserTypeEvent = ({
setVisible,

2
packages/client/src/components/GlobalEvents/CreateEvent.js
View File

@ -4,7 +4,7 @@ import { useTranslation } from "react-i18next";
import { toastr } from "@docspace/shared/components/toast";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import config from "PACKAGE_FILE";

6
packages/client/src/components/GlobalEvents/EditRoomEvent.js
View File

@ -2,9 +2,9 @@ import React, { useState, useEffect, useCallback } from "react";
import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
import { EditRoomDialog } from "../dialogs";
import { Encoder } from "@docspace/common/utils/encoder";
import api from "@docspace/common/api";
import { getRoomInfo } from "@docspace/common/api/rooms";
import { Encoder } from "@docspace/shared/utils/encoder";
import api from "@docspace/shared/api";
import { getRoomInfo } from "@docspace/shared/api/rooms";
import { toastr } from "@docspace/shared/components/toast";
const EditRoomEvent = ({

4
packages/client/src/components/GlobalEvents/index.js
View File

@ -2,8 +2,8 @@ import { useState, useEffect, useCallback, useRef, memo } from "react";
import { inject, observer } from "mobx-react";
import { FileAction } from "@docspace/common/constants";
import { Events } from "@docspace/common/constants";
import { FileAction } from "@docspace/shared/enums";
import { Events } from "@docspace/shared/enums";
import CreateEvent from "./CreateEvent";
import RenameEvent from "./RenameEvent";

2
packages/client/src/components/MainBar/Bar.js
View File

@ -5,7 +5,7 @@ import { withTranslation } from "react-i18next";
import { ADS_TIMEOUT } from "@docspace/client/src/helpers/filesConstants";
import { getConvertedSize } from "@docspace/common/utils";
import { getConvertedSize } from "@docspace/shared/utils/common";
import { getBannerAttribute } from "@docspace/shared/utils";
import { SnackBar } from "@docspace/shared/components/snackbar";

2
packages/client/src/components/NavMenu/i18n.js
View File

@ -1,6 +1,6 @@
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
import Backend from "@docspace/common/utils/i18next-http-backend";
import Backend from "@docspace/shared/utils/i18next-http-backend";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";
import { getCookie } from "@docspace/shared/utils";

2
packages/client/src/components/NavMenu/index.js
View File

@ -19,7 +19,7 @@ import { inject, observer } from "mobx-react";
import i18n from "./i18n";
import PreparationPortalDialog from "../dialogs/PreparationPortalDialog";
import { Base } from "@docspace/shared/themes";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
const StyledContainer = styled.header`
height: 48px;

4
packages/client/src/components/NavMenu/sub-components/header.js
View File

@ -8,11 +8,11 @@ import { isMobileOnly, isMobile } from "react-device-detect";
import { useLocation } from "react-router-dom";
import { useTranslation } from "react-i18next";
import { isDesktop, tablet, mobile } from "@docspace/shared/utils";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { NoUserSelect } from "@docspace/shared/utils";
import HeaderCatalogBurger from "./header-catalog-burger";
import { Base } from "@docspace/shared/themes";
import { getLogoFromPath } from "@docspace/common/utils";
import { getLogoFromPath } from "@docspace/shared/utils";
const Header = styled.header`
display: flex;

2
packages/client/src/components/NavMenu/sub-components/nav-logo-item.js
View File

@ -4,7 +4,7 @@ import PropTypes from "prop-types";
import styled from "styled-components";
import { inject, observer } from "mobx-react";
import { NoUserSelect } from "@docspace/shared/utils";
import { getLogoFromPath } from "@docspace/common/utils";
import { getLogoFromPath } from "@docspace/shared/utils";
const LogoItem = styled.div`
display: flex;
min-width: 48px;

2
packages/client/src/components/NavMenu/sub-components/profile-actions.js
View File

@ -6,7 +6,7 @@ import { Avatar, AvatarSize } from "@docspace/shared/components/avatar";
import { DropDownItem } from "@docspace/shared/components/drop-down-item";
import { Link } from "@docspace/shared/components/link";
import ProfileMenu from "./profile-menu";
import api from "@docspace/common/api";
import api from "@docspace/shared/api";
import DefaultUserPhoto from "PUBLIC_DIR/images/default_user_photo_size_82-82.png";
import { ToggleButton } from "@docspace/shared/components/toggle-button";
import { Button } from "@docspace/shared/components/button";

4
packages/client/src/components/PeopleArticle/Body/index.js
View File

@ -2,7 +2,7 @@
import CatalogFolderReactSvgUrl from "PUBLIC_DIR/images/catalog.folder.react.svg?url";
import React from "react";
import { withTranslation } from "react-i18next";
import Filter from "@docspace/common/api/people/filter";
import Filter from "@docspace/shared/api/people/filter";
import Loaders from "@docspace/common/components/Loaders";
import { inject, observer } from "mobx-react";
import { getSelectedGroup } from "../../../helpers/people-helpers";
@ -10,7 +10,7 @@ import { useNavigate } from "react-router-dom";
import { isMobile } from "@docspace/shared/utils";
import { isMobileOnly } from "react-device-detect";
import config from "PACKAGE_FILE";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { ArticleItem } from "@docspace/shared/components/article-item";
import withLoader from "../../../HOCs/withLoader";

2
packages/client/src/components/PeopleArticle/MainButton/index.js
View File

@ -14,7 +14,7 @@ import { toastr } from "@docspace/shared/components/toast";
import Loaders from "@docspace/common/components/Loaders";
import { inject, observer } from "mobx-react";
import config from "PACKAGE_FILE";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { isMobile } from "react-device-detect";
import {
isMobile as isMobileUtils,

2
packages/client/src/components/PeopleSelector/i18n.js
View File

@ -1,6 +1,6 @@
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
import Backend from "@docspace/common/utils/i18next-http-backend";
import Backend from "@docspace/shared/utils/i18next-http-backend";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";
import { getCookie } from "@docspace/shared/utils";

10
packages/client/src/components/PeopleSelector/index.js
View File

@ -6,12 +6,12 @@ import { I18nextProvider, withTranslation } from "react-i18next";
import { Selector } from "@docspace/shared/components/selector";
import { getUserRole } from "@docspace/common/utils";
import Filter from "@docspace/common/api/people/filter";
import { getUserList } from "@docspace/common/api/people";
import { getUserRole } from "@docspace/shared/utils/common";
import Filter from "@docspace/shared/api/people/filter";
import { getUserList } from "@docspace/shared/api/people";
import Loaders from "@docspace/common/components/Loaders";
import { EmployeeStatus } from "@docspace/common/constants";
import { LOADER_TIMEOUT } from "@docspace/common/constants";
import { EmployeeStatus } from "@docspace/shared/enums";
import { LOADER_TIMEOUT } from "@docspace/shared/constants";
import useLoadingWithTimeout from "SRC_DIR/Hooks/useLoadingWithTimeout";

2
packages/client/src/components/QuickButtons.js
View File

@ -12,7 +12,7 @@ import {
FileStatus,
RoomsType,
ShareAccessRights,
} from "@docspace/common/constants";
} from "@docspace/shared/enums";
import { ColorTheme, ThemeId } from "@docspace/shared/components/color-theme";

8
packages/client/src/components/RoomSelector/index.js
View File

@ -2,10 +2,10 @@
import React from "react";
import { withTranslation } from "react-i18next";
import api from "@docspace/common/api";
import RoomsFilter from "@docspace/common/api/rooms/filter";
import { RoomsType } from "@docspace/common/constants";
import { iconSize32 } from "@docspace/common/utils/image-helpers";
import api from "@docspace/shared/api";
import RoomsFilter from "@docspace/shared/api/rooms/filter";
import { RoomsType } from "@docspace/shared/enums";
import { iconSize32 } from "@docspace/shared/utils/image-helpers";
import Loaders from "@docspace/common/components/Loaders";

4
packages/client/src/components/dialogs/AvatarEditorDialog/index.js
View File

@ -12,8 +12,8 @@ import {
AvatarPreview,
} from "@docspace/shared/components/image-editor";
import { loadAvatar, deleteAvatar } from "@docspace/common/api/people";
import { dataUrlToFile } from "@docspace/common/utils/dataUrlToFile";
import { loadAvatar, deleteAvatar } from "@docspace/shared/api/people";
import { dataUrlToFile } from "@docspace/shared/utils/dataUrlToFile";
import DefaultUserAvatarMax from "PUBLIC_DIR/images/default_user_photo_size_200-200.png";

2
packages/client/src/components/dialogs/BackupCodesDialog/index.js
View File

@ -10,7 +10,7 @@ import { toastr } from "@docspace/shared/components/toast";
import { withTranslation } from "react-i18next";
import ModalDialogContainer from "../ModalDialogContainer";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
import { isDesktop } from "@docspace/shared/utils";
const StyledModal = styled(ModalDialogContainer)`

26
packages/client/src/components/dialogs/ChangeEmailDialog/index.js
View File

@ -9,9 +9,9 @@ import { toastr } from "@docspace/shared/components/toast";
import { withTranslation } from "react-i18next";
import ModalDialogContainer from "../ModalDialogContainer";
import { sendInstructionsToChangeEmail } from "@docspace/common/api/people";
import { sendInstructionsToChangeEmail } from "@docspace/shared/api/people";
import { errorKeys } from "@docspace/shared/constants";
import { ErrorKeys } from "@docspace/shared/enums";
import { inject, observer } from "mobx-react";
class ChangeEmailDialogComponent extends React.Component {
constructor(props) {
@ -99,27 +99,27 @@ class ChangeEmailDialogComponent extends React.Component {
} else {
const translatedErrors = emailErrors.map((errorKey) => {
switch (errorKey) {
case errorKeys.LocalDomain:
case ErrorKeys.LocalDomain:
return t("Common:LocalDomain");
case errorKeys.IncorrectDomain:
case ErrorKeys.IncorrectDomain:
return t("Common:IncorrectDomain");
case errorKeys.DomainIpAddress:
case ErrorKeys.DomainIpAddress:
return t("Common:DomainIpAddress");
case errorKeys.PunycodeDomain:
case ErrorKeys.PunycodeDomain:
return t("Common:PunycodeDomain");
case errorKeys.PunycodeLocalPart:
case ErrorKeys.PunycodeLocalPart:
return t("Common:PunycodeLocalPart");
case errorKeys.IncorrectLocalPart:
case ErrorKeys.IncorrectLocalPart:
return t("Common:IncorrectLocalPart");
case errorKeys.SpacesInLocalPart:
case ErrorKeys.SpacesInLocalPart:
return t("Common:SpacesInLocalPart");
case errorKeys.MaxLengthExceeded:
case ErrorKeys.MaxLengthExceeded:
return t("Common:MaxLengthExceeded");
case errorKeys.IncorrectEmail:
case ErrorKeys.IncorrectEmail:
return t("Common:IncorrectEmail");
case errorKeys.ManyEmails:
case ErrorKeys.ManyEmails:
return t("Common:ManyEmails");
case errorKeys.EmptyEmail:
case ErrorKeys.EmptyEmail:
return t("Common:EmptyEmail");
default:
throw new Error("Unknown translation key");

2
packages/client/src/components/dialogs/ChangePasswordDialog/index.js
View File

@ -8,7 +8,7 @@ import { Link } from "@docspace/shared/components/link";
import { Text } from "@docspace/shared/components/text";
import { withTranslation, Trans } from "react-i18next";
import { sendInstructionsToChangePassword } from "@docspace/common/api/people";
import { sendInstructionsToChangePassword } from "@docspace/shared/api/people";
class ChangePasswordDialogComponent extends React.Component {
constructor() {

2
packages/client/src/components/dialogs/ChangePortalOwnerDialog/index.js
View File

@ -6,7 +6,7 @@ import { withTranslation } from "react-i18next";
import PeopleSelector from "SRC_DIR/components/PeopleSelector";
import Filter from "@docspace/common/api/people/filter";
import Filter from "@docspace/shared/api/people/filter";
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { Avatar } from "@docspace/shared/components/avatar";

2
packages/client/src/components/dialogs/ChangePricingPlanDialog/index.js
View File

@ -8,7 +8,7 @@ import { Text } from "@docspace/shared/components/text";
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { inject, observer } from "mobx-react";
import { getConvertedSize } from "@docspace/common/utils";
import { getConvertedSize } from "@docspace/shared/utils/common";
const ModalDialogContainer = styled(ModalDialog)`
.cannot-downgrade-plan {

4
packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
View File

@ -7,11 +7,11 @@ import { Text } from "@docspace/shared/components/text";
import { Link } from "@docspace/shared/components/link";
import { toastr } from "@docspace/shared/components/toast";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { withTranslation } from "react-i18next";
import { EmployeeStatus } from "@docspace/common/constants";
import { EmployeeStatus } from "@docspace/shared/enums";
import ModalDialogContainer from "../ModalDialogContainer";
import { inject, observer } from "mobx-react";

2
packages/client/src/components/dialogs/ConflictResolveDialog/index.js
View File

@ -8,7 +8,7 @@ import { toastr } from "@docspace/shared/components/toast";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import { ConflictResolveType } from "@docspace/common/constants";
import { ConflictResolveType } from "@docspace/shared/enums";
import styled from "styled-components";

4
packages/client/src/components/dialogs/ConnectDialog/index.js
View File

@ -9,8 +9,8 @@ import { FieldContainer } from "@docspace/shared/components/field-container";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import { getOAuthToken } from "@docspace/common/utils";
import { saveSettingsThirdParty } from "@docspace/common/api/files";
import { getOAuthToken } from "@docspace/shared/utils/common";
import { saveSettingsThirdParty } from "@docspace/shared/api/files";
const PureConnectDialogContainer = (props) => {
const {

2
packages/client/src/components/dialogs/ConvertDialog/index.js
View File

@ -9,7 +9,7 @@ import { Checkbox } from "@docspace/shared/components/checkbox";
import { withTranslation, Trans } from "react-i18next";
import { inject, observer } from "mobx-react";
import Loaders from "@docspace/common/components/Loaders";
import { FolderType } from "@docspace/common/constants";
import { FolderType } from "@docspace/shared/enums";
const ConvertDialogComponent = (props) => {
const {

2
packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
View File

@ -11,7 +11,7 @@ import SimulatePassword from "../../SimulatePassword";
import StyledComponent from "./StyledConvertPasswordDialog";
import config from "PACKAGE_FILE";
import { openDocEditor } from "@docspace/client/src/helpers/filesUtils";
import combineUrl from "@docspace/common/utils/combineUrl";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
let tab, _isMounted;
const ConvertPasswordDialogComponent = (props) => {

2
packages/client/src/components/dialogs/CreateEditRoomDialog/data/index.js
View File

@ -1,4 +1,4 @@
import { RoomsType } from "@docspace/common/constants";
import { RoomsType } from "@docspace/shared/enums";
export const getRoomTypeTitleTranslation = (roomType = 1, t) => {
switch (roomType) {

4
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownDesktop.js
View File

@ -4,7 +4,7 @@ import styled from "styled-components";
import RoomType from "../RoomType";
import { Base } from "@docspace/shared/themes";
import { RoomsType } from "@docspace/common/constants";
import { RoomsTypeValues } from "@docspace/shared/utils/common";
const StyledDropdownDesktop = styled.div`
max-width: 100%;
@ -42,7 +42,7 @@ const DropdownDesktop = ({ t, open, chooseRoomType }) => {
return (
<StyledDropdownDesktop className="dropdown-content-wrapper" isOpen={open}>
<div className="dropdown-content">
{Object.values(RoomsType).map((roomType) => (
{Object.values(RoomsTypeValues).map((roomType) => (
<RoomType
id={roomType}
t={t}

4
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeDropdown/DropdownMobile.js
View File

@ -2,7 +2,7 @@ import React from "react";
import styled from "styled-components";
import RoomType from "../RoomType";
import { RoomsType } from "./../../../../../../../common/constants/index";
import { RoomsTypeValues } from "@docspace/shared/utils/common";
import { Backdrop } from "@docspace/shared/components/backdrop";
import { Base } from "@docspace/shared/themes";
@ -31,7 +31,7 @@ const DropdownMobile = ({ t, open, onClose, chooseRoomType }) => {
<>
<Backdrop visible={open} onClick={onClose} zIndex={450} />
<StyledDropdownMobile className="dropdown-mobile" isOpen={open}>
{Object.values(RoomsType).map((roomType) => (
{Object.values(RoomsTypeValues).map((roomType) => (
<RoomType
id={roomType}
t={t}

4
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/RoomTypeList.js
View File

@ -6,7 +6,7 @@ import RoomType from "./RoomType";
import withLoader from "@docspace/client/src/HOCs/withLoader";
import Loaders from "@docspace/common/components/Loaders";
import { RoomsType } from "./../../../../../../common/constants/index";
import { RoomsTypeValues } from "@docspace/shared/utils/common";
const StyledRoomTypeList = styled.div`
width: 100%;
@ -19,7 +19,7 @@ const StyledRoomTypeList = styled.div`
const RoomTypeList = ({ t, setRoomType }) => {
return (
<StyledRoomTypeList>
{Object.values(RoomsType).map((roomType) => (
{Object.values(RoomsTypeValues).map((roomType) => (
<RoomType
id={roomType}
t={t}

2
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js
View File

@ -9,7 +9,7 @@ import ToggleParam from "../Params/ToggleParam";
import ThirdPartyComboBox from "./ThirdPartyComboBox";
import FolderInput from "./FolderInput";
import { getOAuthToken } from "@docspace/common/utils";
import { getOAuthToken } from "@docspace/shared/utils/common";
const StyledThirdPartyStorage = styled(StyledParam)`
flex-direction: column;

2
packages/client/src/components/dialogs/DataReassignmentDialog/index.js
View File

@ -10,7 +10,7 @@ import { useNavigate } from "react-router-dom";
import Body from "./sub-components/Body";
import Footer from "./sub-components/Footer";
import api from "@docspace/common/api";
import api from "@docspace/shared/api";
const { Filter } = api;
const StyledModalDialog = styled(ModalDialog)`

2
packages/client/src/components/dialogs/DeleteLinkDialog/index.js
View File

@ -10,7 +10,7 @@ import { StyledDeleteLinkDialog } from "./StyledDeleteLinkDialog";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import { RoomsType } from "@docspace/common/constants";
import { RoomsType } from "@docspace/shared/enums";
const DeleteLinkDialogComponent = (props) => {
const {

2
packages/client/src/components/dialogs/DeletePortalDialog/index.js
View File

@ -5,7 +5,7 @@ import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { Button } from "@docspace/shared/components/button";
import { toastr } from "@docspace/shared/components/toast";
import { sendDeletePortalEmail } from "@docspace/common/api/portal";
import { sendDeletePortalEmail } from "@docspace/shared/api/portal";
import ModalDialogContainer from "../ModalDialogContainer";
import { ColorTheme, ThemeId } from "@docspace/shared/components/color-theme";

2
packages/client/src/components/dialogs/DeleteProfileEverDialog/index.js
View File

@ -4,7 +4,7 @@ import { Button } from "@docspace/shared/components/button";
import { toastr } from "@docspace/shared/components/toast";
import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { withTranslation } from "react-i18next";
import api from "@docspace/common/api";
import api from "@docspace/shared/api";
import ModalDialogContainer from "../ModalDialogContainer";
import { inject, observer } from "mobx-react";

2
packages/client/src/components/dialogs/DeleteSelfProfileDialog/index.js
View File

@ -9,7 +9,7 @@ import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { Link } from "@docspace/shared/components/link";
import { Trans, withTranslation } from "react-i18next";
import ModalDialogContainer from "../ModalDialogContainer";
import { sendInstructionsToDelete } from "@docspace/common/api/people";
import { sendInstructionsToDelete } from "@docspace/shared/api/people";
class DeleteSelfProfileDialogComponent extends React.Component {
constructor(props) {

2
packages/client/src/components/dialogs/DeleteThirdPartyDialog/index.js
View File

@ -7,7 +7,7 @@ import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import { useNavigate, useLocation } from "react-router-dom";
import FilesFilter from "@docspace/common/api/files/filter";
import FilesFilter from "@docspace/shared/api/files/filter";
const DeleteThirdPartyDialog = (props) => {
const {

2
packages/client/src/components/dialogs/InviteUsersWarningDialog/index.js
View File

@ -7,7 +7,7 @@ import { ModalDialog } from "@docspace/shared/components/modal-dialog";
import { Button } from "@docspace/shared/components/button";
import { Text } from "@docspace/shared/components/text";
import { getDaysRemaining } from "@docspace/common/utils";
import { getDaysRemaining } from "@docspace/shared/utils/common";
const InviteUsersWarningDialog = (props) => {
const {

2
packages/client/src/components/dialogs/PreparationPortalDialog/i18n.js
View File

@ -1,6 +1,6 @@
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
import Backend from "@docspace/common/utils/i18next-http-backend";
import Backend from "@docspace/shared/utils/i18next-http-backend";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";
import { getCookie } from "@docspace/shared/utils";

2
packages/client/src/components/dialogs/ReportDialog/index.js
View File

@ -17,7 +17,7 @@ import {
downloadJson,
getCurrentDate,
} from "SRC_DIR/helpers/crashReport";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
const ModalDialogContainer = styled(ModalDialog)`
#modal-dialog {

2
packages/client/src/components/dialogs/RestoreRoomDialog/index.js
View File

@ -6,7 +6,7 @@ import { Text } from "@docspace/shared/components/text";
import { Button } from "@docspace/shared/components/button";
import { withTranslation } from "react-i18next";
import { inject, observer } from "mobx-react";
import { RoomsType } from "@docspace/common/constants";
import { RoomsType } from "@docspace/shared/enums";
const StyledModal = styled(ModalDialogContainer)`
max-width: 400px;

2
packages/client/src/components/dialogs/SendInviteDialog/index.js
View File

@ -11,7 +11,7 @@ import { Checkbox } from "@docspace/shared/components/checkbox";
import { FixedSizeList as List, areEqual } from "react-window";
// import AutoSizer from "react-virtualized-auto-sizer";
import { withTranslation } from "react-i18next";
import { resendUserInvites } from "@docspace/common/api/people";
import { resendUserInvites } from "@docspace/shared/api/people";
import ModalDialogContainer from "../ModalDialogContainer";
import { inject, observer } from "mobx-react";

4
packages/client/src/components/dialogs/SubmitToFormGallery/index.js
View File

@ -6,10 +6,10 @@ import { observer, inject } from "mobx-react";
import { Trans, withTranslation } from "react-i18next";
import { ReactSVG } from "react-svg";
import FilesSelector from "@docspace/client/src/components/FilesSelector";
import { FilesSelectorFilterTypes } from "@docspace/common/constants";
import { FilesSelectorFilterTypes } from "@docspace/shared/enums";
import { toastr } from "@docspace/shared/components/toast";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import * as Styled from "./index.styled";

9
packages/client/src/components/panels/AddUsersPanel/index.js
View File

@ -8,12 +8,13 @@ import { Backdrop } from "@docspace/shared/components/backdrop";
import { Selector } from "@docspace/shared/components/selector";
import { toastr } from "@docspace/shared/components/toast";
import { getUserRole } from "@docspace/common/utils";
import Filter from "@docspace/common/api/people/filter";
import { getUserRole } from "@docspace/shared/utils/common";
import Filter from "@docspace/shared/api/people/filter";
import Loaders from "@docspace/common/components/Loaders";
import { getMembersList } from "@docspace/common/api/people";
import { getMembersList } from "@docspace/shared/api/people";
import useLoadingWithTimeout from "SRC_DIR/Hooks/useLoadingWithTimeout";
import { ShareAccessRights, LOADER_TIMEOUT } from "@docspace/common/constants";
import { ShareAccessRights } from "@docspace/shared/enums";
import { LOADER_TIMEOUT } from "@docspace/shared/constants";
import withLoader from "../../../HOCs/withLoader";

5
packages/client/src/components/panels/ChangeRoomOwnerPanel/index.js
View File

@ -5,9 +5,8 @@ import { Aside } from "@docspace/shared/components/aside";
import { Backdrop } from "@docspace/shared/components/backdrop";
import PeopleSelector from "@docspace/client/src/components/PeopleSelector";
import { withTranslation } from "react-i18next";
import Filter from "@docspace/common/api/people/filter";
import { EmployeeType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/common/constants";
import Filter from "@docspace/shared/api/people/filter";
import { EmployeeType, DeviceType } from "@docspace/shared/enums";
import { Portal } from "@docspace/shared/components/portal";
const StyledChangeRoomOwner = styled.div`

4
packages/client/src/components/panels/EditLinkPanel/index.js
View File

@ -14,8 +14,8 @@ import LinkBlock from "./LinkBlock";
import ToggleBlock from "./ToggleBlock";
import PasswordAccessBlock from "./PasswordAccessBlock";
import LimitTimeBlock from "./LimitTimeBlock";
import { RoomsType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/common/constants";
import { RoomsType } from "@docspace/shared/enums";
import { DeviceType } from "@docspace/shared/enums";
import moment from "moment";
const EditLinkPanel = (props) => {

2
packages/client/src/components/panels/EmbeddingPanel/EmbeddingBody.js
View File

@ -9,7 +9,7 @@ import { IconButton } from "@docspace/shared/components/icon-button";
import { Button } from "@docspace/shared/components/button";
import CopyReactSvgUrl from "PUBLIC_DIR/images/copy.react.svg?url";
import { StyledBody } from "./StyledEmbeddingPanel";
import { objectToGetParams } from "@docspace/common/utils";
import { objectToGetParams } from "@docspace/shared/utils/common";
const EmbeddingBody = ({ t, link, requestToken, roomId }) => {
const [size, setSize] = useState("auto");

2
packages/client/src/components/panels/EmbeddingPanel/index.js
View File

@ -6,7 +6,7 @@ import { Aside } from "@docspace/shared/components/aside";
import { withTranslation } from "react-i18next";
import { StyledEmbeddingPanel, StyledScrollbar } from "./StyledEmbeddingPanel";
import EmbeddingBody from "./EmbeddingBody";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
import { Portal } from "@docspace/shared/components/portal";
const EmbeddingPanelComponent = (props) => {
const {

4
packages/client/src/components/panels/InvitePanel/index.js
View File

@ -8,8 +8,8 @@ import React, {
import { observer, inject } from "mobx-react";
import { withTranslation } from "react-i18next";
import { DeviceType } from "@docspace/common/constants";
import { LOADER_TIMEOUT } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
import { LOADER_TIMEOUT } from "@docspace/shared/constants";
import { Backdrop } from "@docspace/shared/components/backdrop";
import { Aside } from "@docspace/shared/components/aside";

4
packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
View File

@ -5,7 +5,7 @@ import { inject, observer } from "mobx-react";
import copy from "copy-to-clipboard";
import { toastr } from "@docspace/shared/components/toast";
import { objectToGetParams } from "@docspace/common/utils";
import { objectToGetParams } from "@docspace/shared/utils/common";
import { InputBlock } from "@docspace/shared/components/input-block";
import { IconButton } from "@docspace/shared/components/icon-button";
@ -22,7 +22,7 @@ import {
StyledToggleButton,
StyledDescription,
} from "../StyledInvitePanel";
import { RoomsType, ShareAccessRights } from "@docspace/common/constants";
import { RoomsType, ShareAccessRights } from "@docspace/shared/enums";
const ExternalLinks = ({
t,

8
packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
View File

@ -11,12 +11,12 @@ import { toastr } from "@docspace/shared/components/toast";
import { parseAddresses } from "@docspace/shared/utils";
import { ComboBox } from "@docspace/shared/components/combobox";
import Filter from "@docspace/common/api/people/filter";
import Filter from "@docspace/shared/api/people/filter";
import BetaBadge from "@docspace/common/components/BetaBadge";
import { getMembersList } from "@docspace/common/api/people";
import { ShareAccessRights } from "@docspace/common/constants";
import { getMembersList } from "@docspace/shared/api/people";
import { ShareAccessRights } from "@docspace/shared/enums";
import withCultureNames from "@docspace/common/hoc/withCultureNames";
import { isBetaLanguage } from "@docspace/common/utils";
import { isBetaLanguage } from "@docspace/shared/utils";
import AddUsersPanel from "../../AddUsersPanel";
import { getAccessOptions } from "../utils";

2
packages/client/src/components/panels/InvitePanel/sub-components/Item.js
View File

@ -6,7 +6,7 @@ import { Text } from "@docspace/shared/components/text";
import { parseAddresses } from "@docspace/shared/utils";
import { getAccessOptions } from "../utils";
import { getUserRole } from "@docspace/common/utils";
import { getUserRole } from "@docspace/shared/utils/common";
import {
StyledEditInput,

2
packages/client/src/components/panels/InvitePanel/utils/index.js
View File

@ -2,7 +2,7 @@ import {
ShareAccessRights,
RoomsType,
EmployeeType,
} from "@docspace/common/constants";
} from "@docspace/shared/enums";
export const getAccessOptions = (
t,

6
packages/client/src/components/panels/NewFilesPanel/index.js
View File

@ -21,7 +21,7 @@ import {
StyledLink,
} from "../StyledPanels";
import { inject, observer } from "mobx-react";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import config from "PACKAGE_FILE";
import Loaders from "@docspace/common/components/Loaders";
import withLoader from "../../../HOCs/withLoader";
@ -29,8 +29,8 @@ import {
getCategoryTypeByFolderType,
getCategoryUrl,
} from "SRC_DIR/helpers/utils";
import FilesFilter from "@docspace/common/api/files/filter";
import { DeviceType } from "@docspace/common/constants";
import FilesFilter from "@docspace/shared/api/files/filter";
import { DeviceType } from "@docspace/shared/enums";
const SharingBodyStyle = { height: `calc(100vh - 156px)` };

134
packages/client/src/components/panels/SharingDialog/index.js
View File

@ -1,77 +1,77 @@
import React, { useEffect } from "react";
import { Provider as MobxProvider, inject, observer } from "mobx-react";
import { getShareFiles } from "@docspace/common/api/files";
import SharingPanel from "../SharingPanel";
import store from "client/store";
// import React, { useEffect } from "react";
// import { Provider as MobxProvider, inject, observer } from "mobx-react";
// // import { getShareFiles } from "@docspace/shared/api/files";
// import SharingPanel from "../SharingPanel";
// import store from "client/store";
const { auth: authStore } = store;
// const { auth: authStore } = store;
const SharingDialog = ({
sharingObject,
onSuccess,
isVisible,
setSharingPanelVisible,
onCancel,
setSelection,
theme,
sharingPanelVisible,
settings,
}) => {
useEffect(() => {
setSharingPanelVisible(isVisible);
}, [isVisible]);
// const SharingDialog = ({
// sharingObject,
// onSuccess,
// isVisible,
// setSharingPanelVisible,
// onCancel,
// setSelection,
// theme,
// sharingPanelVisible,
// settings,
// }) => {
// useEffect(() => {
// setSharingPanelVisible(isVisible);
// }, [isVisible]);
useEffect(() => {
setSelection([sharingObject]);
}, []);
// useEffect(() => {
// setSelection([sharingObject]);
// }, []);
return (
<>
{sharingPanelVisible && (
<SharingPanel
key="sharing-panel"
uploadPanelVisible={false}
onSuccess={onSuccess}
onCancel={onCancel}
theme={theme}
settings={settings}
/>
)}
</>
);
};
// return (
// <>
// {sharingPanelVisible && (
// <SharingPanel
// key="sharing-panel"
// uploadPanelVisible={false}
// onSuccess={onSuccess}
// onCancel={onCancel}
// theme={theme}
// settings={settings}
// />
// )}
// </>
// );
// };
const SharingDialogWrapper = inject(({ dialogsStore, filesStore }) => {
const { getShareUsers, setSelection } = filesStore;
const { setSharingPanelVisible, sharingPanelVisible } = dialogsStore;
return {
setSharingPanelVisible,
getShareUsers,
setSelection,
sharingPanelVisible,
};
})(observer(SharingDialog));
// const SharingDialogWrapper = inject(({ dialogsStore, filesStore }) => {
// const { getShareUsers, setSelection } = filesStore;
// const { setSharingPanelVisible, sharingPanelVisible } = dialogsStore;
// return {
// setSharingPanelVisible,
// getShareUsers,
// setSelection,
// sharingPanelVisible,
// };
// })(observer(SharingDialog));
class SharingModal extends React.Component {
static getSharingSettings = (fileId) =>
getShareFiles([+fileId], []).then((users) =>
this.convertSharingUsers(users)
);
// class SharingModal extends React.Component {
// static getSharingSettings = (fileId) =>
// getShareFiles([+fileId], []).then((users) =>
// this.convertSharingUsers(users)
// );
static convertSharingUsers = (users) =>
Promise.resolve(SharingPanel.convertSharingUsers(users));
// static convertSharingUsers = (users) =>
// Promise.resolve(SharingPanel.convertSharingUsers(users));
componentDidMount() {
authStore.init(true);
}
// componentDidMount() {
// authStore.init(true);
// }
render() {
return (
<MobxProvider {...store}>
<SharingDialogWrapper {...this.props} />
</MobxProvider>
);
}
}
// render() {
// return (
// <MobxProvider {...store}>
// <SharingDialogWrapper {...this.props} />
// </MobxProvider>
// );
// }
// }
export default SharingModal;
// export default SharingModal;

2
packages/client/src/components/panels/SharingPanel/AccessComboBox.js
View File

@ -8,7 +8,7 @@ import AccessNoneReactSvgUrl from "PUBLIC_DIR/images/access.none.react.svg?url";
import DeleteReactSvgUrl from "PUBLIC_DIR/images/delete.react.svg?url";
import React from "react";
import { ComboBox } from "@docspace/shared/components/combobox";
import { ShareAccessRights } from "@docspace/common/constants";
import { ShareAccessRights } from "@docspace/shared/enums";
import { DropDownItem } from "@docspace/shared/components/drop-down-item";
import { AccessRightSelect } from "@docspace/shared/components/access-right-select";
import { getAccessIcon } from "../../../helpers/files-helpers";

2
packages/client/src/components/panels/SharingPanel/Body.js
View File

@ -4,7 +4,7 @@ import { VariableSizeList as List } from "react-window";
import { isMobileOnly } from "react-device-detect";
import { CustomScrollbarsVirtualList } from "@docspace/shared/components/scrollbar";
import { ShareAccessRights } from "@docspace/common/constants";
import { ShareAccessRights } from "@docspace/shared/enums";
import ExternalLink from "./ExternalLink";
import InternalLink from "./InternalLink";

4
packages/client/src/components/panels/SharingPanel/ExternalLink.js
View File

@ -1,8 +1,8 @@
import React from "react";
import copy from "copy-to-clipboard";
import { objectToGetParams } from "@docspace/common/utils";
import { ShareAccessRights } from "@docspace/common/constants";
import { objectToGetParams } from "@docspace/shared/utils/common";
import { ShareAccessRights } from "@docspace/shared/enums";
import { toastr } from "@docspace/shared/components/toast";
import { ToggleButton } from "@docspace/shared/components/toggle-button";

4
packages/client/src/components/panels/SharingPanel/i18n.js
View File

@ -1,9 +1,9 @@
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
import Backend from "@docspace/common/utils/i18next-http-backend";
import Backend from "@docspace/shared/utils/i18next-http-backend";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";
import { getLtrLanguageForEditor } from "@docspace/common/utils";
import { getLtrLanguageForEditor } from "@docspace/shared/utils/common";
import { loadLanguagePath } from "SRC_DIR/helpers/utils";
import { getCookie } from "@docspace/shared/utils";

1914
packages/client/src/components/panels/SharingPanel/index.js
View File

File diff suppressed because it is too large Load Diff

2
packages/client/src/components/panels/SharingPanel/linkRow.js
View File

@ -5,7 +5,7 @@ import { LinkWithDropdown } from "@docspace/shared/components/link-with-dropdown
import { ToggleButton } from "@docspace/shared/components/toggle-button";
import { StyledLinkRow } from "../StyledPanels";
import AccessComboBox from "./AccessComboBox";
import { ShareAccessRights } from "@docspace/common/constants";
import { ShareAccessRights } from "@docspace/shared/enums";
import AccessEditIcon from "PUBLIC_DIR/images/access.edit.react.svg";
import CopyIcon from "PUBLIC_DIR/images/copy.react.svg";
import { commonIconsStyles } from "@docspace/shared/utils";

2
packages/client/src/components/panels/VersionHistoryPanel/index.js
View File

@ -6,7 +6,7 @@ import { Aside } from "@docspace/shared/components/aside";
import Loaders from "@docspace/common/components/Loaders";
import { FloatingButton } from "@docspace/shared/components/floating-button";
import { Portal } from "@docspace/shared/components/portal";
import { DeviceType } from "@docspace/common/constants";
import { DeviceType } from "@docspace/shared/enums";
import { withTranslation } from "react-i18next";
import {
StyledVersionHistoryPanel,

5
packages/client/src/helpers/confirmRoute.js
View File

@ -3,8 +3,9 @@ import { useLocation, Navigate } from "react-router-dom";
import { AuthenticatedAction, ValidationResult } from "./../helpers/constants";
import { Loader } from "@docspace/shared/components/loader";
import Section from "@docspace/common/components/Section";
import { checkConfirmLink } from "@docspace/common/api/user"; //TODO: Move AuthStore
import { combineUrl, getObjectByLocation } from "@docspace/common/utils";
import { checkConfirmLink } from "@docspace/shared/api/user"; //TODO: Move AuthStore
import { getObjectByLocation } from "@docspace/shared/utils/common";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { inject, observer } from "mobx-react";
const ConfirmRoute = ({

2
packages/client/src/helpers/desktop.js
View File

@ -1,5 +1,5 @@
import store from "../store";
import { desktopConstants } from "@docspace/common/desktop";
import { desktopConstants } from "@docspace/shared/utils/desktop";
import { encryptionUploadDialog as encryptionUploadDialogHelper } from "./encryptionUploadDialog";
export function encryptionUploadDialog(callback) {

2
packages/client/src/helpers/encryptionUploadDialog.js
View File

@ -1,4 +1,4 @@
import { desktopConstants } from "@docspace/common/desktop";
import { desktopConstants } from "@docspace/shared/utils/desktop";
export function encryptionUploadDialog(extsWebEncrypt, callback) {
const filter = extsWebEncrypt.map((f) => "*" + f).join(" ");

2
packages/client/src/helpers/files-helpers.js
View File

@ -7,7 +7,7 @@ import AccessCommentReactSvgUrl from "PUBLIC_DIR/images/access.comment.react.svg
import AccessFormReactSvgUrl from "PUBLIC_DIR/images/access.form.react.svg?url";
import CustomFilterReactSvgUrl from "PUBLIC_DIR/images/custom.filter.react.svg?url";
import { EDITOR_PROTOCOL } from "./filesConstants";
import { combineUrl } from "@docspace/common/utils";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { homepage } from "PACKAGE_FILE";
export const presentInArray = (array, search, caseInsensitive = false) => {

9
packages/client/src/helpers/filesUtils.js
View File

@ -8,13 +8,14 @@ import CloudServicesNextcloudReactSvgUrl from "PUBLIC_DIR/images/cloud.services.
import CatalogFolderReactSvgUrl from "PUBLIC_DIR/images/catalog.folder.react.svg?url";
import CloudServicesWebdavReactSvgUrl from "PUBLIC_DIR/images/cloud.services.webdav.react.svg?url";
import authStore from "@docspace/common/store/AuthStore";
import { FileType, RoomsType } from "@docspace/common/constants";
import { FileType, RoomsType } from "@docspace/shared/enums";
import config from "PACKAGE_FILE";
import { combineUrl, toUrlParams } from "@docspace/common/utils";
import { addFileToRecentlyViewed } from "@docspace/common/api/files";
import { toUrlParams } from "@docspace/shared/utils/common";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { addFileToRecentlyViewed } from "@docspace/shared/api/files";
import i18n from "./i18n";
import { request } from "@docspace/common/api/client";
import { request } from "@docspace/shared/api/client";
export const getFileTypeName = (fileType) => {
switch (fileType) {

2
packages/client/src/helpers/i18n.js
View File

@ -1,6 +1,6 @@
import i18n from "i18next";
import { initReactI18next } from "react-i18next";
import Backend from "@docspace/common/utils/i18next-http-backend";
import Backend from "@docspace/shared/utils/i18next-http-backend";
import { LANGUAGE } from "@docspace/shared/constants";
import config from "PACKAGE_FILE";
import { getCookie } from "@docspace/shared/utils";

2
packages/client/src/helpers/people-helpers.js
View File

@ -5,7 +5,7 @@ import { find, cloneDeep } from "lodash";
import {
EmployeeActivationStatus,
EmployeeStatus,
} from "@docspace/common/constants";
} from "@docspace/shared/enums";
import PhoneIconUrl from "PUBLIC_DIR/images/phone.react.svg?url";
import MobileIconUrl from "PUBLIC_DIR/images/mobile.react.svg?url";

Some files were not shown because too many files have changed in this diff Show More