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

Doceditor: fix ts problems

Browse Source
This commit is contained in:
Timofey Boyko 2024-08-22 12:46:24 +03:00
parent dd93f09ebc
commit 817b1aae0c
7 changed files with 8 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/doceditor/src/app/(root)/layout.tsx
View File

@ -55,18 +55,14 @@ export default async function RootLayout({
return <></>;
}
const startDate = new Date();
const [user, settings, colorTheme] = await Promise.all([
getUser(),
getSettings(),
getColorTheme(),
]);
const timer = new Date().getTime() - startDate.getTime();
if (settings === "access-restricted") redirect(`${getBaseUrl()}/${settings}`);
const api_host = process.env.API_HOST?.trim();
return (
<html lang="en" translate="no">
<head>
@ -82,11 +78,7 @@ export default async function RootLayout({
</head>
<body>
<StyledComponentsRegistry>
<Providers
contextData={{ user, settings, systemTheme, colorTheme }}
api_host={api_host}
timer={timer}
>
<Providers contextData={{ user, settings, systemTheme, colorTheme }}>
{children}
</Providers>
</StyledComponentsRegistry>

4
packages/doceditor/src/components/Error/Error.tsx
View File

@ -9,7 +9,6 @@ import type { TFirebaseSettings } from "@docspace/shared/api/settings/types";
import useI18N from "@/hooks/useI18N";
import useTheme from "@/hooks/useTheme";
import useDeviceType from "@/hooks/useDeviceType";
import useWhiteLabel from "@/hooks/useWhiteLabel";
import pkg from "../../../package.json";
@ -18,7 +17,7 @@ import { ErrorProps } from "./Error.types";
const Error = ({ settings, user, error }: ErrorProps) => {
const { i18n } = useI18N({ settings, user });
const { currentDeviceType } = useDeviceType();
const { logoUrls } = useWhiteLabel();
const { theme } = useTheme({ user });
const firebaseHelper = useMemo(() => {
@ -32,7 +31,6 @@ const Error = ({ settings, user, error }: ErrorProps) => {
errorLog={error}
version={pkg.version}
user={user ?? ({} as TUser)}
whiteLabelLogoUrls={logoUrls}
firebaseHelper={firebaseHelper}
currentDeviceType={currentDeviceType}
/>

11
packages/doceditor/src/components/Root.tsx
View File

@ -26,14 +26,14 @@
"use client";
import React, { useEffect } from "react";
import React from "react";
import { useTranslation } from "react-i18next";
import ErrorContainer from "@docspace/shared/components/error-container/ErrorContainer";
import { TResponse } from "@/types";
import useError from "@/hooks/useError";
import useError from "@/hooks/useError";
import useRootInit from "@/hooks/useRootInit";
import useDeepLink from "@/hooks/useDeepLink";
import useSelectFileDialog from "@/hooks/useSelectFileDialog";
@ -46,6 +46,7 @@ import useStartFillingSelectDialog from "@/hooks/useStartFillingSelectDialog";
import DeepLink from "./deep-link";
import Editor from "./Editor";
import SelectFileDialog from "./SelectFileDialog";
import SelectFolderDialog from "./SelectFolderDialog";
import SharingDialog from "./ShareDialog";
@ -64,7 +65,6 @@ const Root = ({
doc,
fileId,
hash,
timer,
}: TResponse) => {
const editorRef = React.useRef<null | HTMLElement>(null);
@ -81,11 +81,6 @@ const Root = ({
const { t } = useTranslation(["Editor", "Common"]);
useEffect(() => {
console.log("editor timer: ", timer);
console.log("openEdit timer: ", config?.timer);
}, [config?.timer, timer]);
useRootInit({
documentType: config?.documentType,
});

2
packages/doceditor/src/components/file-password/index.tsx
View File

@ -178,7 +178,7 @@ const FilePassword = ({ shareKey, title, entryTitle }: FilePasswordProps) => {
id="password"
inputName="password"
placeholder={t("Common:Password")}
type={InputType.password}
inputType={InputType.password}
inputValue={password}
hasError={!!errorMessage}
size={InputSize.large}

7
packages/doceditor/src/providers/TranslationProvider.tsx
View File

@ -44,16 +44,9 @@ const TranslationProvider = ({
children,
settings,
user,
api_host,
timer,
}: TTranslationProvider) => {
const { i18n } = useI18N({ settings, user });
React.useEffect(() => {
console.log("API_HOST: ", api_host);
console.log("LAYOUT API timer:", timer);
}, [api_host, timer]);
return <I18nextProvider i18n={i18n}>{children}</I18nextProvider>;
};

4
packages/doceditor/src/providers/index.tsx
View File

@ -48,9 +48,9 @@ export type TProviders = {
contextData: TContextData;
};
const Providers = ({ children, contextData, api_host, timer }: TProviders) => {
const Providers = ({ children, contextData }: TProviders) => {
return (
<TranslationProvider {...contextData} api_host={api_host} timer={timer}>
<TranslationProvider {...contextData}>
<ThemeProvider {...contextData}>
<ErrorProvider {...contextData}>
{children}

2
packages/doceditor/src/utils/actions.ts
View File

@ -65,8 +65,6 @@ export async function getFillingSession(
);
try {
console.log({ request });
const response = await fetch(request);
if (response.ok) return await response.json();