Skip to content

Commit

Permalink
Merge branch 'main' into Matvey-Kuk/minor-docs-polish
Browse files Browse the repository at this point in the history
  • Loading branch information
Matvey-Kuk authored Jun 10, 2024
2 parents 813a316 + e1224cc commit c5171d8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 59 deletions.
5 changes: 1 addition & 4 deletions keep-ui/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { ReactNode } from "react";
import { NextAuthProvider } from "./auth-provider";
import ErrorBoundary from "./error-boundary";
import { Intercom } from "@/components/ui/Intercom";
import { Mulish } from "next/font/google";

import "./globals.css";
Expand Down Expand Up @@ -37,14 +36,12 @@ export default async function RootLayout({ children }: RootLayoutProps) {
</NextAuthProvider>

{/** footer */}
{process.env.GIT_COMMIT_HASH ? (
{process.env.GIT_COMMIT_HASH && (
<div className="fixed right-2.5 bottom-2.5 text-gray-500 text-sm">
Build: {process.env.GIT_COMMIT_HASH}
<br />
Version: {process.env.KEEP_VERSION}
</div>
) : (
<Intercom />
)}
</body>
</html>
Expand Down
19 changes: 12 additions & 7 deletions keep-ui/app/providers/page.client.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import useSWR from "swr";
import Loading from "../loading";
import { LayoutContext } from "./context";
import { toast } from "react-toastify";
import { updateIntercom } from "@/components/ui/Intercom";
import { useRouter } from "next/navigation";

export const useFetchProviders = () => {
Expand Down Expand Up @@ -73,7 +72,12 @@ export const useFetchProviders = () => {
}, [isLocalhost]);

useEffect(() => {
if (data && providers.length === 0 && installedProviders.length === 0 && linkedProviders.length === 0) {
if (
data &&
providers.length === 0 &&
installedProviders.length === 0 &&
linkedProviders.length === 0
) {
const fetchedInstalledProviders = data.installed_providers.map(
(provider) => ({
...provider,
Expand All @@ -100,7 +104,12 @@ export const useFetchProviders = () => {
setProviders(fetchedProviders);
setLinkedProviders(fetchedLinkedProviders); // Update state with linked providers
}
}, [data, providers.length, installedProviders.length, linkedProviders?.length]);
}, [
data,
providers.length,
installedProviders.length,
linkedProviders?.length,
]);

return {
providers,
Expand All @@ -115,7 +124,6 @@ export const useFetchProviders = () => {
};
};


export default function ProvidersPage({
searchParams,
}: {
Expand Down Expand Up @@ -146,9 +154,6 @@ export default function ProvidersPage({
});
}
}, [searchParams]);
useEffect(() => {
updateIntercom(session?.user);
}, [session?.user]);

if (status === "loading") return <Loading />;
if (status === "unauthenticated") router.push("/signin");
Expand Down
3 changes: 0 additions & 3 deletions keep-ui/app/providers/providers-tiles.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import ProviderForm from "./provider-form";
import ProviderTile from "./provider-tile";
import "react-sliding-side-panel/lib/index.css";
import { useSearchParams } from "next/navigation";
import { hideOrShowIntercom } from "@/components/ui/Intercom";
import { QuestionMarkCircleIcon } from "@heroicons/react/24/outline";

const ProvidersTiles = ({
Expand Down Expand Up @@ -78,7 +77,6 @@ const ProvidersTiles = ({
// on linked providers, don't open the modal
if (provider.linked) return;

hideOrShowIntercom(true);
setSelectedProvider(provider);
if (installedProvidersMode) {
setFormValues({
Expand All @@ -91,7 +89,6 @@ const ProvidersTiles = ({

const handleCloseModal = () => {
setOpenPanel(false);
hideOrShowIntercom(false);
setSelectedProvider(null);
setFormValues({});
setFormErrors({});
Expand Down
45 changes: 0 additions & 45 deletions keep-ui/components/ui/Intercom.tsx

This file was deleted.

0 comments on commit c5171d8

Please sign in to comment.