From 16e0a441ae64a45bf8f771306be67c8f79f1aa5e Mon Sep 17 00:00:00 2001 From: Maidul Islam Date: Tue, 30 Jul 2024 11:00:27 -0400 Subject: [PATCH] unblock prod pipeline --- frontend/src/views/Org/MembersPage/MembersPage.tsx | 6 +++--- .../components/UserProjectsSection/UserProjectRow.tsx | 2 +- frontend/src/views/Project/MembersPage/MembersPage.tsx | 6 +++--- frontend/src/views/Project/RolePage/RolePage.tsx | 2 +- .../components/SelectionPanel/SelectionPanel.tsx | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/src/views/Org/MembersPage/MembersPage.tsx b/frontend/src/views/Org/MembersPage/MembersPage.tsx index 303411ab0..786e672ac 100644 --- a/frontend/src/views/Org/MembersPage/MembersPage.tsx +++ b/frontend/src/views/Org/MembersPage/MembersPage.tsx @@ -1,11 +1,11 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { useRouter } from 'next/router'; -import { useEffect, useState } from 'react'; +import { useEffect, useState } from "react"; +import { useRouter } from "next/router"; import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2"; import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context"; import { withPermission } from "@app/hoc"; -import { isTabSection, TabSections } from "@app/views/Org/Types";; +import { isTabSection, TabSections } from "@app/views/Org/Types"; import { OrgIdentityTab, OrgMembersTab, OrgRoleTabSection } from "./components"; diff --git a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx index 0e13442a5..68a974a4b 100644 --- a/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx +++ b/frontend/src/views/Org/UserPage/components/UserProjectsSection/UserProjectRow.tsx @@ -9,7 +9,7 @@ import { useWorkspace } from "@app/context"; import { ProjectMembershipRole } from "@app/hooks/api/roles/types"; import { TWorkspaceUser } from "@app/hooks/api/types"; import { UsePopUpState } from "@app/hooks/usePopUp"; -import { TabSections } from "@app/views/Org/Types";; +import { TabSections } from "@app/views/Org/Types"; type Props = { membership: TWorkspaceUser; diff --git a/frontend/src/views/Project/MembersPage/MembersPage.tsx b/frontend/src/views/Project/MembersPage/MembersPage.tsx index 5b30b1d4e..f3af1454e 100644 --- a/frontend/src/views/Project/MembersPage/MembersPage.tsx +++ b/frontend/src/views/Project/MembersPage/MembersPage.tsx @@ -1,13 +1,13 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { useRouter } from 'next/router'; -import { useEffect, useState } from 'react'; +import { useEffect, useState } from "react"; +import { useRouter } from "next/router"; import { Tab, TabList, TabPanel, Tabs } from "@app/components/v2"; import { ProjectPermissionActions, ProjectPermissionSub } from "@app/context"; import { withProjectPermission } from "@app/hoc"; +import { isTabSection,TabSections } from "../Types"; import { IdentityTab, MembersTab,ProjectRoleListTab, ServiceTokenTab } from "./components"; -import { TabSections, isTabSection } from '../Types'; export const MembersPage = withProjectPermission( diff --git a/frontend/src/views/Project/RolePage/RolePage.tsx b/frontend/src/views/Project/RolePage/RolePage.tsx index 95ea64a90..373de2538 100644 --- a/frontend/src/views/Project/RolePage/RolePage.tsx +++ b/frontend/src/views/Project/RolePage/RolePage.tsx @@ -20,8 +20,8 @@ import { withProjectPermission } from "@app/hoc"; import { useDeleteProjectRole,useGetProjectRoleBySlug } from "@app/hooks/api"; import { usePopUp } from "@app/hooks/usePopUp"; +import { TabSections } from "../Types"; import { RoleDetailsSection, RoleModal, RolePermissionsSection } from "./components"; -import { TabSections } from '../Types'; export const RolePage = withProjectPermission( () => { diff --git a/frontend/src/views/SecretOverviewPage/components/SelectionPanel/SelectionPanel.tsx b/frontend/src/views/SecretOverviewPage/components/SelectionPanel/SelectionPanel.tsx index 162c193a1..bddaa9f03 100644 --- a/frontend/src/views/SecretOverviewPage/components/SelectionPanel/SelectionPanel.tsx +++ b/frontend/src/views/SecretOverviewPage/components/SelectionPanel/SelectionPanel.tsx @@ -72,11 +72,11 @@ export const SelectionPanel = ({ const getDeleteModalTitle = () => { if (selectedFolderCount > 0 && selectedKeysCount > 0) { return "Do you want to delete the selected secrets and folders across environments?"; - } else if (selectedKeysCount > 0 && selectedFolderCount === 0) { - return "Do you want to delete the selected secrets across environments?"; - } else { - return "Do you want to delete the selected folders across environments?"; } + if (selectedKeysCount > 0) { + return "Do you want to delete the selected secrets across environments?"; + } + return "Do you want to delete the selected folders across environments?"; } const handleBulkDelete = async () => {