From c6166696d250f298aa611a60bcdb8e165ec2b5ca Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 8 Jan 2025 22:22:25 -0800 Subject: [PATCH] fix build --- .../controllers/private/adminController.ts | 9 +++--- .../private/govOrganizationController.ts | 29 +++++-------------- .../private/organizationController.ts | 19 ++++++------ web/components/templates/keys/keyPage.tsx | 1 - .../templates/settings/settingsLayout.tsx | 2 +- web/pages/admin/governance-orgs.tsx | 1 - 6 files changed, 22 insertions(+), 39 deletions(-) diff --git a/valhalla/jawn/src/controllers/private/adminController.ts b/valhalla/jawn/src/controllers/private/adminController.ts index 2ba65871e..88f437aff 100644 --- a/valhalla/jawn/src/controllers/private/adminController.ts +++ b/valhalla/jawn/src/controllers/private/adminController.ts @@ -7,19 +7,18 @@ import { Patch, Path, Post, - Put, Request, Route, Security, Tags, } from "tsoa"; -import { JawnAuthenticatedRequest } from "../../types/request"; -import { supabaseServer } from "../../lib/db/supabase"; -import { Setting, SettingName } from "../../utils/settings"; import { clickhouseDb } from "../../lib/db/ClickhouseWrapper"; -import { dbExecute } from "../../lib/shared/db/dbExecute"; +import { supabaseServer } from "../../lib/db/supabase"; import { prepareRequestAzure } from "../../lib/experiment/requestPrep/azure"; +import { dbExecute } from "../../lib/shared/db/dbExecute"; import { getGovernanceOrgs } from "../../lib/stores/AdminStore"; +import { JawnAuthenticatedRequest } from "../../types/request"; +import { Setting, SettingName } from "../../utils/settings"; export const authCheckThrow = async (userId: string | undefined) => { if (!userId) { diff --git a/valhalla/jawn/src/controllers/private/govOrganizationController.ts b/valhalla/jawn/src/controllers/private/govOrganizationController.ts index 186ded926..cd52af37b 100644 --- a/valhalla/jawn/src/controllers/private/govOrganizationController.ts +++ b/valhalla/jawn/src/controllers/private/govOrganizationController.ts @@ -1,30 +1,17 @@ import { - Route, - Tags, - Security, - Controller, Body, + Controller, + Get, + Path, Post, Request, - Path, - Delete, - Get, - Query, + Route, + Security, + Tags, } from "tsoa"; -import { err, ok, Result } from "../../lib/shared/result"; -import { JawnAuthenticatedRequest } from "../../types/request"; -import { - NewOrganizationParams, - OrganizationFilter, - OrganizationLayout, - OrganizationManager, - OrganizationMember, - OrganizationOwner, - UpdateOrganizationParams, -} from "../../managers/organization/OrganizationManager"; import { supabaseServer } from "../../lib/db/supabase"; -import { StripeManager } from "../../managers/stripe/StripeManager"; -import { getGovernanceOrgs } from "../../lib/stores/AdminStore"; +import { err, ok } from "../../lib/shared/result"; +import { JawnAuthenticatedRequest } from "../../types/request"; @Route("v1/gov-organization") @Tags("Gov Organization") diff --git a/valhalla/jawn/src/controllers/private/organizationController.ts b/valhalla/jawn/src/controllers/private/organizationController.ts index 3151c729e..f25139aea 100644 --- a/valhalla/jawn/src/controllers/private/organizationController.ts +++ b/valhalla/jawn/src/controllers/private/organizationController.ts @@ -1,18 +1,18 @@ import { - Route, - Tags, - Security, - Controller, Body, - Post, - Request, - Path, + Controller, Delete, Get, + Path, + Post, Query, + Request, + Route, + Security, + Tags, } from "tsoa"; +import { supabaseServer } from "../../lib/db/supabase"; import { err, ok, Result } from "../../lib/shared/result"; -import { JawnAuthenticatedRequest } from "../../types/request"; import { NewOrganizationParams, OrganizationFilter, @@ -22,9 +22,8 @@ import { OrganizationOwner, UpdateOrganizationParams, } from "../../managers/organization/OrganizationManager"; -import { supabaseServer } from "../../lib/db/supabase"; import { StripeManager } from "../../managers/stripe/StripeManager"; -import { getGovernanceOrgs } from "../../lib/stores/AdminStore"; +import { JawnAuthenticatedRequest } from "../../types/request"; @Route("v1/organization") @Tags("Organization") diff --git a/web/components/templates/keys/keyPage.tsx b/web/components/templates/keys/keyPage.tsx index 15313f1fa..0b14912a5 100644 --- a/web/components/templates/keys/keyPage.tsx +++ b/web/components/templates/keys/keyPage.tsx @@ -14,7 +14,6 @@ import ThemedModal from "../../shared/themed/themedModal"; import ThemedTable from "../../shared/themed/themedTable"; import { useKeysPage } from "./useKeysPage"; import AddKeyModal from "./addKeyModal"; -import { useIsGovernanceEnabled } from "../organization/hooks"; interface KeyPageProps { hideTabs?: boolean; diff --git a/web/components/templates/settings/settingsLayout.tsx b/web/components/templates/settings/settingsLayout.tsx index fef37b41c..96fb8fd59 100644 --- a/web/components/templates/settings/settingsLayout.tsx +++ b/web/components/templates/settings/settingsLayout.tsx @@ -9,7 +9,7 @@ import { UserGroupIcon, } from "@heroicons/react/24/outline"; import { Separator } from "@/components/ui/separator"; -import { FingerprintIcon, KeyIcon, LinkIcon, LockIcon } from "lucide-react"; +import { FingerprintIcon, KeyIcon, LinkIcon } from "lucide-react"; import Link from "next/link"; import { useRouter } from "next/router"; import { ReactNode, useMemo } from "react"; diff --git a/web/pages/admin/governance-orgs.tsx b/web/pages/admin/governance-orgs.tsx index 8dd26ccb4..6e8f4c402 100644 --- a/web/pages/admin/governance-orgs.tsx +++ b/web/pages/admin/governance-orgs.tsx @@ -1,7 +1,6 @@ import { User } from "@supabase/auth-helpers-nextjs"; import { ReactElement } from "react"; import AdminLayout from "../../components/layout/admin/adminLayout"; -import { AdminOnPremPage } from "../../components/templates/admin/onPrem/adminOnPrem"; import { withAuthSSR } from "../../lib/api/handlerWrappers"; import { supabaseServer } from "../../lib/supabaseServer"; import { AdminGovernanceOrgsPage } from "@/components/templates/admin/onPrem/GovernanceOrgs";