From 7c77cc4ea455b836e05e481af4116158d9d7f099 Mon Sep 17 00:00:00 2001 From: akhilmhdh Date: Sat, 24 Jun 2023 23:44:52 +0530 Subject: [PATCH] fix(integrations-page): eslint fixes to the new upstream changes made --- frontend/package.json | 2 +- .../DeleteActionModal/DeleteActionModal.tsx | 2 +- frontend/src/hooks/api/bots/index.tsx | 2 +- frontend/src/hooks/api/bots/queries.tsx | 8 ++-- frontend/src/hooks/api/integrations/index.tsx | 2 +- .../src/hooks/api/integrations/queries.tsx | 12 +++--- .../IntegrationPage.utils.tsx | 2 +- .../CloudIntegrationSection.tsx | 40 +++++++++---------- .../CloudIntegrationSection/index.tsx | 2 +- .../FrameworkIntegrationSection.tsx | 10 ++--- .../FrameworkIntegrationSection/index.tsx | 2 +- .../IntegrationsSection.tsx | 36 ++++++++--------- .../components/IntegrationsSection/index.tsx | 2 +- frontend/src/views/IntegrationsPage/index.tsx | 2 +- 14 files changed, 62 insertions(+), 62 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 420cec611..a678504f7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -7,7 +7,7 @@ "start": "next start", "start:docker": "next build && next start", "lint": "eslint --ext js,ts,tsx ./src", - "lint-and-fix": "eslint --fix --ext js,ts,tsx ./src", + "lint:fix": "eslint --fix --ext js,ts,tsx ./src", "type-check": "tsc --project tsconfig.json", "storybook": "storybook dev -p 6006 -s ./public", "build-storybook": "storybook build" diff --git a/frontend/src/components/v2/DeleteActionModal/DeleteActionModal.tsx b/frontend/src/components/v2/DeleteActionModal/DeleteActionModal.tsx index ebe45bf9b..5c1bb376a 100644 --- a/frontend/src/components/v2/DeleteActionModal/DeleteActionModal.tsx +++ b/frontend/src/components/v2/DeleteActionModal/DeleteActionModal.tsx @@ -24,7 +24,7 @@ export const DeleteActionModal = ({ deleteKey, onDeleteApproved, title, - subTitle = 'This action is irreversible!' + subTitle = "This action is irreversible!" }: Props): JSX.Element => { const [inputData, setInputData] = useState(""); const [isLoading, setIsLoading] = useToggle(); diff --git a/frontend/src/hooks/api/bots/index.tsx b/frontend/src/hooks/api/bots/index.tsx index aa2ee6030..17a5fe768 100644 --- a/frontend/src/hooks/api/bots/index.tsx +++ b/frontend/src/hooks/api/bots/index.tsx @@ -1 +1 @@ -export { useGetWorkspaceBot, useUpdateBotActiveStatus } from './queries'; +export { useGetWorkspaceBot, useUpdateBotActiveStatus } from "./queries"; diff --git a/frontend/src/hooks/api/bots/queries.tsx b/frontend/src/hooks/api/bots/queries.tsx index 14c5d4f94..1c28c9640 100644 --- a/frontend/src/hooks/api/bots/queries.tsx +++ b/frontend/src/hooks/api/bots/queries.tsx @@ -1,11 +1,11 @@ -import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import { apiRequest } from '@app/config/request'; +import { apiRequest } from "@app/config/request"; -import { TBot, TSetBotActiveStatusDto } from './types'; +import { TBot, TSetBotActiveStatusDto } from "./types"; const queryKeys = { - getBot: (workspaceId: string) => [{ workspaceId }, 'bot'] as const + getBot: (workspaceId: string) => [{ workspaceId }, "bot"] as const }; const fetchWorkspaceBot = async (workspaceId: string) => { diff --git a/frontend/src/hooks/api/integrations/index.tsx b/frontend/src/hooks/api/integrations/index.tsx index 9ea8edb17..3ad1051f4 100644 --- a/frontend/src/hooks/api/integrations/index.tsx +++ b/frontend/src/hooks/api/integrations/index.tsx @@ -1 +1 @@ -export { useDeleteIntegration,useGetCloudIntegrations } from './queries'; +export { useDeleteIntegration,useGetCloudIntegrations } from "./queries"; diff --git a/frontend/src/hooks/api/integrations/queries.tsx b/frontend/src/hooks/api/integrations/queries.tsx index 6f8db4882..c1353b6c6 100644 --- a/frontend/src/hooks/api/integrations/queries.tsx +++ b/frontend/src/hooks/api/integrations/queries.tsx @@ -1,17 +1,17 @@ -import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'; +import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import { apiRequest } from '@app/config/request'; +import { apiRequest } from "@app/config/request"; -import { workspaceKeys } from '../workspace/queries'; -import { TCloudIntegration } from './types'; +import { workspaceKeys } from "../workspace/queries"; +import { TCloudIntegration } from "./types"; export const integrationQueryKeys = { - getIntegrations: () => ['integrations'] as const + getIntegrations: () => ["integrations"] as const }; const fetchIntegrations = async () => { const { data } = await apiRequest.get<{ integrationOptions: TCloudIntegration[] }>( - '/api/v1/integration-auth/integration-options' + "/api/v1/integration-auth/integration-options" ); return data.integrationOptions; diff --git a/frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx b/frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx index 3db86abf2..fc60ead6d 100644 --- a/frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx +++ b/frontend/src/views/IntegrationsPage/IntegrationPage.utils.tsx @@ -1,6 +1,6 @@ import crypto from "crypto"; -import { UserWsKeyPair, TCloudIntegration } from "@app/hooks/api/types"; +import { TCloudIntegration,UserWsKeyPair } from "@app/hooks/api/types"; import { decryptAssymmetric, diff --git a/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx b/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx index 5a41f9984..f3b88a6c0 100644 --- a/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx +++ b/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/CloudIntegrationSection.tsx @@ -1,10 +1,10 @@ -import { useTranslation } from 'react-i18next'; -import { faCheck, faXmark } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { useTranslation } from "react-i18next"; +import { faCheck, faXmark } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { DeleteActionModal,Skeleton, Tooltip } from '@app/components/v2'; -import { usePopUp } from '@app/hooks'; -import { IntegrationAuth, TCloudIntegration } from '@app/hooks/api/types'; +import { DeleteActionModal,Skeleton, Tooltip } from "@app/components/v2"; +import { usePopUp } from "@app/hooks"; +import { IntegrationAuth, TCloudIntegration } from "@app/hooks/api/types"; type Props = { isLoading?: boolean; @@ -26,7 +26,7 @@ export const CloudIntegrationSection = ({ }: Props) => { const { t } = useTranslation(); const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([ - 'deleteConfirmation' + "deleteConfirmation" ] as const); const isEmpty = !isLoading && !cloudIntegrations?.length; @@ -34,12 +34,12 @@ export const CloudIntegrationSection = ({ return (
-

{t('integrations.cloud-integrations')}

-

{t('integrations.click-to-start')}

+

{t("integrations.cloud-integrations")}

+

{t("integrations.click-to-start")}

{isLoading && Array.from({ length: 12 }).map((_, index) => ( @@ -53,8 +53,8 @@ export const CloudIntegrationSection = ({ tabIndex={0} className={`group relative ${ cloudIntegration.isAvailable - ? 'cursor-pointer duration-200 hover:bg-mineshaft-700' - : 'opacity-50' + ? "cursor-pointer duration-200 hover:bg-mineshaft-700" + : "opacity-50" } flex h-32 flex-row items-center rounded-md border border-mineshaft-600 bg-mineshaft-800 p-4`} onClick={() => { if (!cloudIntegration.isAvailable) return; @@ -68,11 +68,11 @@ export const CloudIntegrationSection = ({ width={70} alt="integration logo" /> - {cloudIntegration.name.split(' ').length > 2 ? ( + {cloudIntegration.name.split(" ").length > 2 ? (
-
{cloudIntegration.name.split(' ')[0]}
+
{cloudIntegration.name.split(" ")[0]}
- {cloudIntegration.name.split(' ')[1]} {cloudIntegration.name.split(' ')[2]} + {cloudIntegration.name.split(" ")[1]} {cloudIntegration.name.split(" ")[2]}
) : ( @@ -95,7 +95,7 @@ export const CloudIntegrationSection = ({ tabIndex={0} onClick={async (event) => { event.stopPropagation(); - handlePopUpOpen('deleteConfirmation', { + handlePopUpOpen("deleteConfirmation", { provider: cloudIntegration.slug }); }} @@ -123,15 +123,15 @@ export const CloudIntegrationSection = ({ handlePopUpToggle('deleteConfirmation', isOpen)} - deleteKey={(popUp?.deleteConfirmation?.data as TRevokeIntegrationPopUp)?.provider || ''} + onChange={(isOpen) => handlePopUpToggle("deleteConfirmation", isOpen)} + deleteKey={(popUp?.deleteConfirmation?.data as TRevokeIntegrationPopUp)?.provider || ""} onDeleteApproved={async () => { onIntegrationRevoke( (popUp.deleteConfirmation.data as TRevokeIntegrationPopUp)?.provider, - () => handlePopUpClose('deleteConfirmation') + () => handlePopUpClose("deleteConfirmation") ); }} /> diff --git a/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/index.tsx b/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/index.tsx index ffb6c738d..62f7a006c 100644 --- a/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/index.tsx +++ b/frontend/src/views/IntegrationsPage/components/CloudIntegrationSection/index.tsx @@ -1 +1 @@ -export { CloudIntegrationSection } from './CloudIntegrationSection'; +export { CloudIntegrationSection } from "./CloudIntegrationSection"; diff --git a/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/FrameworkIntegrationSection.tsx b/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/FrameworkIntegrationSection.tsx index c51b2d3ee..1b2a4f5ce 100644 --- a/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/FrameworkIntegrationSection.tsx +++ b/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/FrameworkIntegrationSection.tsx @@ -1,4 +1,4 @@ -import { useTranslation } from 'react-i18next'; +import { useTranslation } from "react-i18next"; type Props = { frameworks: Array<{ @@ -15,12 +15,12 @@ export const FrameworkIntegrationSection = ({ frameworks }: Props) => { return ( <>
-

{t('integrations.framework-integrations')}

-

{t('integrations.click-to-setup')}

+

{t("integrations.framework-integrations")}

+

{t("integrations.click-to-setup")}

{frameworks.map((framework) => ( { >
1 ? 'px-1 text-sm' : 'px-2 text-xl' + framework?.name?.split(" ").length > 1 ? "px-1 text-sm" : "px-2 text-xl" } w-full max-w-xs text-center`} > {framework?.image && ( diff --git a/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/index.tsx b/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/index.tsx index 04bbda30b..1738b8179 100644 --- a/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/index.tsx +++ b/frontend/src/views/IntegrationsPage/components/FrameworkIntegrationSection/index.tsx @@ -1 +1 @@ -export { FrameworkIntegrationSection } from './FrameworkIntegrationSection'; +export { FrameworkIntegrationSection } from "./FrameworkIntegrationSection"; diff --git a/frontend/src/views/IntegrationsPage/components/IntegrationsSection/IntegrationsSection.tsx b/frontend/src/views/IntegrationsPage/components/IntegrationsSection/IntegrationsSection.tsx index c38242990..5c0df8fd7 100644 --- a/frontend/src/views/IntegrationsPage/components/IntegrationsSection/IntegrationsSection.tsx +++ b/frontend/src/views/IntegrationsPage/components/IntegrationsSection/IntegrationsSection.tsx @@ -1,6 +1,6 @@ -import { faArrowRight, faXmark } from '@fortawesome/free-solid-svg-icons'; -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { integrationSlugNameMapping } from 'public/data/frequentConstants'; +import { faArrowRight, faXmark } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { integrationSlugNameMapping } from "public/data/frequentConstants"; import { DeleteActionModal, @@ -11,9 +11,9 @@ import { Select, SelectItem, Skeleton -} from '@app/components/v2'; -import { usePopUp } from '@app/hooks'; -import { TIntegration } from '@app/hooks/api/types'; +} from "@app/components/v2"; +import { usePopUp } from "@app/hooks"; +import { TIntegration } from "@app/hooks/api/types"; type Props = { environments: Array<{ name: string; slug: string }>; @@ -29,7 +29,7 @@ export const IntegrationsSection = ({ onIntegrationDelete }: Props) => { const { popUp, handlePopUpOpen, handlePopUpClose, handlePopUpToggle } = usePopUp([ - 'deleteConfirmation' + "deleteConfirmation" ] as const); return ( @@ -95,15 +95,15 @@ export const IntegrationsSection = ({
- {integration.integration === 'hashicorp-vault' + {integration.integration === "hashicorp-vault" ? `${integration.app} - path: ${integration.path}` : integration.app}
- {(integration.integration === 'vercel' || - integration.integration === 'netlify' || - integration.integration === 'railway' || - integration.integration === 'gitlab') && ( + {(integration.integration === "vercel" || + integration.integration === "netlify" || + integration.integration === "railway" || + integration.integration === "gitlab") && (
@@ -115,7 +115,7 @@ export const IntegrationsSection = ({
handlePopUpOpen('deleteConfirmation', integration)} + onClick={() => handlePopUpOpen("deleteConfirmation", integration)} ariaLabel="delete" colorSchema="danger" > @@ -130,13 +130,13 @@ export const IntegrationsSection = ({ handlePopUpToggle('deleteConfirmation', isOpen)} - deleteKey={(popUp?.deleteConfirmation?.data as TIntegration)?.app || ''} + (popUp?.deleteConfirmation.data as TIntegration)?.integrationAuth || " " + } integration for ${(popUp?.deleteConfirmation.data as TIntegration)?.app || " "}?`} + onChange={(isOpen) => handlePopUpToggle("deleteConfirmation", isOpen)} + deleteKey={(popUp?.deleteConfirmation?.data as TIntegration)?.app || ""} onDeleteApproved={async () => onIntegrationDelete(popUp?.deleteConfirmation.data as TIntegration, () => - handlePopUpClose('deleteConfirmation') + handlePopUpClose("deleteConfirmation") ) } /> diff --git a/frontend/src/views/IntegrationsPage/components/IntegrationsSection/index.tsx b/frontend/src/views/IntegrationsPage/components/IntegrationsSection/index.tsx index a171edb8a..6f40d79fa 100644 --- a/frontend/src/views/IntegrationsPage/components/IntegrationsSection/index.tsx +++ b/frontend/src/views/IntegrationsPage/components/IntegrationsSection/index.tsx @@ -1 +1 @@ -export { IntegrationsSection } from './IntegrationsSection'; +export { IntegrationsSection } from "./IntegrationsSection"; diff --git a/frontend/src/views/IntegrationsPage/index.tsx b/frontend/src/views/IntegrationsPage/index.tsx index 5cef86ea2..eb9f8496e 100644 --- a/frontend/src/views/IntegrationsPage/index.tsx +++ b/frontend/src/views/IntegrationsPage/index.tsx @@ -1 +1 @@ -export { IntegrationsPage } from './IntegrationsPage'; +export { IntegrationsPage } from "./IntegrationsPage";