From a80c0318abea4251d55fed8c319cc5155d466f49 Mon Sep 17 00:00:00 2001 From: Timofey Boyko Date: Wed, 15 Nov 2023 17:28:31 +0300 Subject: [PATCH] Client: fix after merge --- .../categories/developer-tools/OAuth/OAuth.types.ts | 2 +- .../categories/developer-tools/OAuth/index.tsx | 4 ++-- .../sub-components/ClientForm/ClientForm.types.ts | 2 +- .../OAuth/sub-components/ClientForm/Loader.tsx | 5 +++-- .../OAuth/sub-components/List/Loader.tsx | 10 ++++------ .../OAuth/sub-components/List/index.tsx | 2 +- .../RegisterNewButton/RegisterNewButton.types.ts | 2 +- .../Body/sub-components/authorized-apps/index.tsx | 6 ++++-- .../authorized-apps/sub-components/RevokeDialog.tsx | 2 +- 9 files changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/OAuth.types.ts b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/OAuth.types.ts index 114b0b6f19..209a60c2c3 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/OAuth.types.ts +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/OAuth.types.ts @@ -1,5 +1,5 @@ //@ts-ignore -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; import { IClientProps } from "@docspace/common/utils/oauth/interfaces"; //@ts-ignore diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/index.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/index.tsx index 2b084542c4..b3e471ecdf 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/index.tsx +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/index.tsx @@ -1,8 +1,8 @@ import React from "react"; import { inject, observer } from "mobx-react"; import { useTranslation } from "react-i18next"; - -import { useViewEffect } from "@docspace/common/hooks"; +//@ts-ignore +import useViewEffect from "SRC_DIR/Hooks/useViewEffect"; //@ts-ignore import { OAuthStoreProps } from "SRC_DIR/store/OAuthStore"; diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.types.ts b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.types.ts index 735ec0118f..fed0a06e9a 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.types.ts +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/ClientForm.types.ts @@ -5,7 +5,7 @@ import { IClientReqDTO, IScope, } from "@docspace/common/utils/oauth/interfaces"; -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; export interface InputProps { value: string; diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/Loader.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/Loader.tsx index 72a9a7315b..fc5eddffd3 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/Loader.tsx +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/ClientForm/Loader.tsx @@ -1,8 +1,9 @@ import React from "react"; //@ts-ignore -import RectangleLoader from "@docspace/common/components/Loaders/RectangleLoader"; -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import RectangleLoader from "@docspace/components/skeletons/rectangle"; +//@ts-ignore +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; import { StyledBlock, diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/Loader.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/Loader.tsx index b7ebbb455a..6beff233d7 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/Loader.tsx +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/Loader.tsx @@ -1,8 +1,9 @@ import React from "react"; //@ts-ignore -import RectangleLoader from "@docspace/common/components/Loaders/RectangleLoader"; -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import RectangleLoader from "@docspace/components/skeletons/rectangle"; +//@ts-ignore +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; //@ts-ignore import Loaders from "@docspace/common/components/Loaders"; @@ -21,9 +22,6 @@ const OAuthLoader = ({ }) => { const buttonHeight = currentDeviceType !== "desktop" ? "40px" : "32px"; - const listLoader = - viewAs === "table" ? : ; - return ( @@ -37,7 +35,7 @@ const OAuthLoader = ({ width={"220px"} height={buttonHeight} /> - {listLoader} + {/* {viewAs === "table" ? : } */} ); diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/index.tsx b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/index.tsx index 6e60efe3c5..7fa60bd2b9 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/index.tsx +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/List/index.tsx @@ -15,7 +15,7 @@ import TableView from "./TableView"; import RowView from "./RowView"; import RegisterNewButton from "../RegisterNewButton"; -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; export const StyledContainer = styled.div` width: 100%; diff --git a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/RegisterNewButton/RegisterNewButton.types.ts b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/RegisterNewButton/RegisterNewButton.types.ts index 027c4fff6e..9f34556337 100644 --- a/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/RegisterNewButton/RegisterNewButton.types.ts +++ b/packages/client/src/pages/PortalSettings/categories/developer-tools/OAuth/sub-components/RegisterNewButton/RegisterNewButton.types.ts @@ -1,4 +1,4 @@ -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; export interface RegisterNewButtonProps { t: any; diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx index aa31ab8b93..a6f2d4fe64 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/index.tsx @@ -3,9 +3,11 @@ import { inject, observer } from "mobx-react"; import { useTranslation } from "react-i18next"; import { IClientProps } from "@docspace/common/utils/oauth/interfaces"; -import { useViewEffect } from "@docspace/common/hooks"; -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +//@ts-ignore +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; +//@ts-ignore +import useViewEffect from "SRC_DIR/Hooks/useViewEffect"; //@ts-ignore import { Consumer } from "@docspace/components/utils/context"; import Text from "@docspace/components/text"; diff --git a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/RevokeDialog.tsx b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/RevokeDialog.tsx index a98ed46d62..f3d904b4f6 100644 --- a/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/RevokeDialog.tsx +++ b/packages/client/src/pages/Profile/Section/Body/sub-components/authorized-apps/sub-components/RevokeDialog.tsx @@ -5,7 +5,7 @@ import { useTranslation, Trans } from "react-i18next"; import ModalDialog from "@docspace/components/modal-dialog"; import Text from "@docspace/components/text"; import Button from "@docspace/components/button"; -import { DeviceUnionType } from "@docspace/common/hooks/useViewEffect"; +import { DeviceUnionType } from "SRC_DIR/Hooks/useViewEffect"; import { IClientProps } from "@docspace/common/utils/oauth/interfaces"; interface RevokeDialogProps {