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

Merge pull request #594 from ONLYOFFICE/bugfix/imports

Browse Source 
Bugfix/imports
This commit is contained in:
Timofey Boyko 2024-08-21 15:18:15 +03:00 committed by GitHub
commit dd33346a46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 40 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ import { Provider as MobxProvider } from "mobx-react";
import ThemeProvider from "./components/ThemeProviderWrapper";
import ErrorBoundary from "./components/ErrorBoundaryWrapper";
import store from "client/store";
import store from "SRC_DIR/store";
import i18n from "./i18n";
import "@docspace/shared/polyfills/broadcastchannel";

2
packages/client/src/pages/PortalSettings/categories/common/Branding/WhiteLabelWrapper.js
View File

@ -26,7 +26,7 @@
import React, { useEffect } from "react";
import { Provider as MobxProvider } from "mobx-react";
import store from "client/store";
import store from "SRC_DIR/store";
import CommonWhiteLabel from "./CommonWhiteLabel";
const { authStore } = store;

2
packages/client/src/store/AccountsHotkeysStore.ts
View File

@ -28,7 +28,7 @@ import { makeAutoObservable } from "mobx";
import { isMobile } from "@docspace/shared/utils";
import { checkDialogsOpen } from "@docspace/shared/utils/checkDialogsOpen";
import { TUser, TUserGroup } from "@docspace/shared/api/people/types";
import { TABLE_HEADER_HEIGHT } from "@docspace/shared/utils/device";
import { TABLE_HEADER_HEIGHT } from "@docspace/shared/components/table/Table.constants";
type AccountsType = TUser | TUserGroup;

2
packages/client/src/store/HotkeyStore.js
View File

@ -37,7 +37,7 @@ import getFilesFromEvent from "@docspace/shared/components/drag-and-drop/get-fil
import config from "PACKAGE_FILE";
import { getCategoryUrl } from "SRC_DIR/helpers/utils";
import { encryptionUploadDialog } from "../helpers/encryptionUploadDialog";
import { TABLE_HEADER_HEIGHT } from "@docspace/shared/utils/device";
import { TABLE_HEADER_HEIGHT } from "@docspace/shared/components/table/Table.constants";
class HotkeyStore {
filesStore;

4
packages/client/src/store/UploadDataStore.js
View File

@ -59,7 +59,7 @@ import {
getCategoryTypeByFolderType,
getCategoryUrl,
} from "SRC_DIR/helpers/utils";
import { Link, LinkTarget, LinkType } from "@docspace/shared/components/link";
import { Link } from "@docspace/shared/components/link";
import { globalColors } from "@docspace/shared/themes";
class UploadDataStore {
@ -1583,8 +1583,6 @@ class UploadDataStore {
<Link
isHovered
color={globalColors.link}
type={LinkType.action}
target={LinkTarget.self}
onClick={() => {
toastr.clear();
this.setUploadPanelVisible(true);

7
packages/client/webpack.config.js
View File

@ -324,16 +324,11 @@ module.exports = (env, argv) => {
};
}
const remotes = {
client: "client@/remoteEntry.js",
login: "login@/login/remoteEntry.js",
};
config.plugins.push(
new ModuleFederationPlugin({
name: "client",
filename: "remoteEntry.js",
remotes: remotes,
remotes: [],
exposes: {
"./shell": "./src/Shell",
"./store": "./src/store",

30
packages/shared/components/table/Table.constants.ts Normal file
View File

@ -0,0 +1,30 @@
// (c) Copyright Ascensio System SIA 2009-2024
//
// This program is a free software product.
// You can redistribute it and/or modify it under the terms
// of the GNU Affero General Public License (AGPL) version 3 as published by the Free Software
// Foundation. In accordance with Section 7(a) of the GNU AGPL its Section 15 shall be amended
// to the effect that Ascensio System SIA expressly excludes the warranty of non-infringement of
// any third-party rights.
//
// This program is distributed WITHOUT ANY WARRANTY, without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For details, see
// the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
//
// You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, EU, LV-1021.
//
// The interactive user interfaces in modified source and object code versions of the Program must
// display Appropriate Legal Notices, as required under Section 5 of the GNU AGPL version 3.
//
// Pursuant to Section 7(b) of the License you must retain the original Product logo when
// distributing the program. Pursuant to Section 7(e) we decline to grant you any rights under
// trademark law for use of our trademarks.
//
// All the Product's GUI elements, including illustrations and icon sets, as well as technical writing
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
export const DEFAULT_MIN_COLUMN_SIZE = 110;
export const SETTINGS_SIZE = 24;
export const MIN_SIZE_FIRST_COLUMN = 210;
export const TABLE_HEADER_HEIGHT = 40;

5
packages/shared/components/table/Table.utils.ts
View File

@ -24,10 +24,7 @@
// content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
export const MIN_SIZE_FIRST_COLUMN = 210;
export const DEFAULT_MIN_COLUMN_SIZE = 110;
export const SETTINGS_SIZE = 24;
export const HANDLE_OFFSET = 8;
import { SETTINGS_SIZE } from "./Table.constants";
export const getSubstring = (str: string) => +str.substring(0, str.length - 2);

8
packages/shared/components/table/TableHeader.tsx
View File

@ -38,14 +38,12 @@ import {
import { TTableColumn, TableHeaderProps } from "./Table.types";
import { TableSettings } from "./sub-components/TableSettings";
import { TableHeaderCell } from "./sub-components/TableHeaderCell";
import { checkingForUnfixedSize, getSubstring } from "./Table.utils";
import {
DEFAULT_MIN_COLUMN_SIZE,
MIN_SIZE_FIRST_COLUMN,
SETTINGS_SIZE,
HANDLE_OFFSET,
checkingForUnfixedSize,
getSubstring,
} from "./Table.utils";
MIN_SIZE_FIRST_COLUMN,
} from "./Table.constants";
import { isDesktop } from "../../utils";
class TableHeaderComponent extends React.Component<

1
packages/shared/utils/device.ts
View File

@ -25,7 +25,6 @@
// International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
export const INFO_PANEL_WIDTH = 400;
export const TABLE_HEADER_HEIGHT = 40;
export const MAX_INFINITE_LOADER_SHIFT = 800;
export function checkIsSSR() {