-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v3' of https://github.com/itsparser/golem into VasanthMain
- Loading branch information
Showing
6 changed files
with
1,330 additions
and
1,376 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,166 +1,159 @@ | ||
| import { API } from "@/service"; | ||
| import { useCallback, useEffect, useMemo, useState } from "react"; | ||
| import { Outlet, useLocation, useNavigate, useParams } from "react-router-dom"; | ||
| import { | ||
| SidebarInset, | ||
| SidebarProvider, | ||
| SidebarTrigger, | ||
| } from "@/components/ui/sidebar.tsx"; | ||
| import { SidebarMenu } from "@/components/sidebar.tsx"; | ||
| import { Separator } from "@/components/ui/separator.tsx"; | ||
| import {API} from "@/service"; | ||
| import {useCallback, useEffect, useMemo, useState} from "react"; | ||
| import {Outlet, useLocation, useNavigate, useParams} from "react-router-dom"; | ||
| import {SidebarInset, SidebarProvider, SidebarTrigger,} from "@/components/ui/sidebar.tsx"; | ||
| import {SidebarMenu} from "@/components/sidebar.tsx"; | ||
| import {Separator} from "@/components/ui/separator.tsx"; | ||
| import ErrorBoundary from "@/components/errorBoundary.tsx"; | ||
| import { CircleFadingPlusIcon, Home, Settings } from "lucide-react"; | ||
| import {CircleFadingPlusIcon, Home, Settings} from "lucide-react"; | ||
| import { | ||
| Breadcrumb, | ||
| BreadcrumbItem, | ||
| BreadcrumbLink, | ||
| BreadcrumbList, | ||
| BreadcrumbPage, | ||
| BreadcrumbSeparator, | ||
| Breadcrumb, | ||
| BreadcrumbItem, | ||
| BreadcrumbLink, | ||
| BreadcrumbList, | ||
| BreadcrumbPage, | ||
| BreadcrumbSeparator, | ||
| } from "@/components/ui/breadcrumb.tsx"; | ||
| import { Api } from "@/types/api.ts"; | ||
| import { | ||
| Select, | ||
| SelectContent, | ||
| SelectItem, | ||
| SelectTrigger, | ||
| SelectValue, | ||
| } from "@/components/ui/select.tsx"; | ||
| import { NavRoutes } from "@/components/nav-route.tsx"; | ||
| import {Api} from "@/types/api.ts"; | ||
| import {Select, SelectContent, SelectItem, SelectTrigger, SelectValue,} from "@/components/ui/select.tsx"; | ||
| import {NavRoutes} from "@/components/nav-route.tsx"; | ||
|
|
||
| const MenuItems = (apiName: string, version: string) => [ | ||
| { | ||
| title: "Overview", | ||
| url: `/apis/${apiName}/version/${version}`, | ||
| icon: Home, | ||
| }, | ||
| { | ||
| title: "Settings", | ||
| url: `/apis/${apiName}/version/${version}/settings`, | ||
| icon: Settings, | ||
| }, | ||
| { | ||
| title: "New Version", | ||
| url: `/apis/${apiName}/version/${version}/newversion`, | ||
| icon: CircleFadingPlusIcon, | ||
| }, | ||
| { | ||
| title: "Overview", | ||
| url: `/apis/${apiName}/version/${version}`, | ||
| icon: Home, | ||
| }, | ||
| { | ||
| title: "Settings", | ||
| url: `/apis/${apiName}/version/${version}/settings`, | ||
| icon: Settings, | ||
| }, | ||
| { | ||
| title: "New Version", | ||
| url: `/apis/${apiName}/version/${version}/newversion`, | ||
| icon: CircleFadingPlusIcon, | ||
| }, | ||
| ]; | ||
|
|
||
| export const ApiLayout = () => { | ||
| const { apiName, version } = useParams(); | ||
| const navigate = useNavigate(); | ||
| const [apiDetails, setApiDetails] = useState([] as Api[]); | ||
| const {apiName, version} = useParams(); | ||
| const navigate = useNavigate(); | ||
| const [apiDetails, setApiDetails] = useState([] as Api[]); | ||
|
|
||
| const [currentApiDetails, setCurrentApiDetails] = useState({} as Api); | ||
| const [currentMenu, setCurrentMenu] = useState("Overview"); | ||
| const [currentApiDetails, setCurrentApiDetails] = useState({} as Api); | ||
| const [currentMenu, setCurrentMenu] = useState("Overview"); | ||
|
|
||
| const basePath = useLocation().pathname.replace( | ||
| `/apis/${apiName}/version/${version}`, | ||
| "" | ||
| ); | ||
| const sortedVersions = useMemo(() => { | ||
| return [...apiDetails].sort((a, b) => | ||
| b.version.localeCompare(a.version, undefined, { numeric: true }) | ||
| const basePath = useLocation().pathname.replace( | ||
| `/apis/${apiName}/version/${version}`, | ||
| "" | ||
| ); | ||
| }, [apiDetails]); | ||
|
|
||
| useEffect(() => { | ||
| API.getApi(apiName!).then(async (response) => { | ||
| setApiDetails(response); | ||
| const selectedApi = response.find((api) => api.version === version); | ||
| if (selectedApi) { | ||
| setCurrentApiDetails(selectedApi); | ||
| } | ||
| }); | ||
| if (location.pathname.includes("settings")) setCurrentMenu("Settings"); | ||
| else if (location.pathname.includes("routes")) setCurrentMenu("Routes"); | ||
| else if (location.pathname.includes("newversion")) | ||
| setCurrentMenu("New Version"); | ||
| else if (location.pathname.includes("manage")) setCurrentMenu("Manage"); | ||
| }, [apiName, version]); | ||
| const sortedVersions = useMemo(() => { | ||
| return [...apiDetails].sort((a, b) => | ||
| b.version.localeCompare(a.version, undefined, {numeric: true}) | ||
| ); | ||
| }, [apiDetails]); | ||
|
|
||
| const handleNavigateHome = useCallback(() => { | ||
| navigate(`/apis/${apiName}/version/${version}`); | ||
| setCurrentMenu("Overview"); | ||
| }, [navigate, apiName, version]); | ||
| useEffect(() => { | ||
| API.getApi(apiName!).then(async (response) => { | ||
| setApiDetails(response); | ||
| const selectedApi = response.find((api) => api.version === version); | ||
| if (selectedApi) { | ||
| setCurrentApiDetails(selectedApi); | ||
| } | ||
| }); | ||
| if (location.pathname.includes("settings")) setCurrentMenu("Settings"); | ||
| else if (location.pathname.includes("routes/add")) | ||
| setCurrentMenu("Add New Route"); | ||
| else if (location.pathname.includes("routes")) setCurrentMenu("Routes"); | ||
| else if (location.pathname.includes("newversion")) | ||
| setCurrentMenu("New Version"); | ||
| else if (location.pathname.includes("manage")) setCurrentMenu("Manage"); | ||
| }, [apiName, version]); | ||
|
|
||
| return ( | ||
| <ErrorBoundary> | ||
| <SidebarProvider> | ||
| <SidebarMenu | ||
| menus={MenuItems(apiName!, version!)} | ||
| activeItem={currentMenu} | ||
| setActiveItem={setCurrentMenu} | ||
| title={"Worker"} | ||
| > | ||
| <NavRoutes | ||
| routes={(currentApiDetails?.routes || []).map((route) => { | ||
| return { | ||
| method: route.method, | ||
| name: route.path, | ||
| url: `/apis/${apiName}/version/${version}/routes/?path=${route.path}&method=${route.method}`, | ||
| }; | ||
| })} | ||
| newRouteEndpoint={`/apis/${apiName}/version/${version}/routes/add?`} | ||
| setActiveItem={(value) => setCurrentMenu(value)} | ||
| activeItem={currentMenu} | ||
| /> | ||
| </SidebarMenu> | ||
| <SidebarInset> | ||
| <header className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12 border-b"> | ||
| <div className="flex items-center gap-2 px-4"> | ||
| <SidebarTrigger className="-ml-1" /> | ||
| <Separator orientation="vertical" className="mr-2 h-4" /> | ||
| const handleNavigateHome = useCallback(() => { | ||
| navigate(`/apis/${apiName}/version/${version}`); | ||
| setCurrentMenu("Overview"); | ||
| }, [navigate, apiName, version]); | ||
|
|
||
| <Breadcrumb> | ||
| <BreadcrumbList> | ||
| <BreadcrumbItem className="hidden md:block cursor-pointer"> | ||
| <BreadcrumbLink asChild> | ||
| <span onClick={handleNavigateHome}>{apiName}</span> | ||
| </BreadcrumbLink> | ||
| </BreadcrumbItem> | ||
| <BreadcrumbSeparator className="hidden md:block" /> | ||
| <BreadcrumbItem> | ||
| <BreadcrumbPage>{currentMenu}</BreadcrumbPage> | ||
| </BreadcrumbItem> | ||
| </BreadcrumbList> | ||
| </Breadcrumb> | ||
| </div> | ||
| {/*push this to right*/} | ||
| <div className={"flex items-center gap-4"}> | ||
| <div className="flex items-center gap-2"> | ||
| <Select | ||
| defaultValue={version} | ||
| onValueChange={(version) => { | ||
| const selectedApi = apiDetails.find( | ||
| (api) => api.version === version | ||
| ); | ||
| if (selectedApi) { | ||
| navigate( | ||
| `/apis/${apiName}/version/${version}${basePath}` | ||
| ); | ||
| } | ||
| }} | ||
| return ( | ||
| <ErrorBoundary> | ||
| <SidebarProvider> | ||
| <SidebarMenu | ||
| menus={MenuItems(apiName!, version!)} | ||
| activeItem={currentMenu} | ||
| setActiveItem={setCurrentMenu} | ||
| title={"Worker"} | ||
| > | ||
| <SelectTrigger> | ||
| <SelectValue>{version}</SelectValue> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| {sortedVersions.map((api) => ( | ||
| <SelectItem value={api.version} key={api.version}> | ||
| {api.version} {api.draft ? "(Draft)" : "(Published)"} | ||
| </SelectItem> | ||
| ))} | ||
| </SelectContent> | ||
| </Select> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| <ErrorBoundary> | ||
| <Outlet /> | ||
| </ErrorBoundary> | ||
| </SidebarInset> | ||
| </SidebarProvider> | ||
| </ErrorBoundary> | ||
| ); | ||
| <NavRoutes | ||
| routes={(currentApiDetails?.routes || []).map((route) => { | ||
| return { | ||
| method: route.method, | ||
| name: route.path, | ||
| url: `/apis/${apiName}/version/${version}/routes/?path=${route.path}&method=${route.method}`, | ||
| }; | ||
| })} | ||
| newRouteEndpoint={`/apis/${apiName}/version/${version}/routes/add?`} | ||
| setActiveItem={(value) => setCurrentMenu(value)} | ||
| activeItem={currentMenu} | ||
| /> | ||
| </SidebarMenu> | ||
| <SidebarInset> | ||
| <header | ||
| className="flex h-16 shrink-0 items-center gap-2 transition-[width,height] ease-linear group-has-[[data-collapsible=icon]]/sidebar-wrapper:h-12 border-b"> | ||
| <div className="flex items-center gap-2 px-4"> | ||
| <SidebarTrigger className="-ml-1"/> | ||
| <Separator orientation="vertical" className="mr-2 h-4"/> | ||
|
|
||
| <Breadcrumb> | ||
| <BreadcrumbList> | ||
| <BreadcrumbItem className="hidden md:block cursor-pointer"> | ||
| <BreadcrumbLink asChild> | ||
| <span onClick={handleNavigateHome}>{apiName}</span> | ||
| </BreadcrumbLink> | ||
| </BreadcrumbItem> | ||
| <BreadcrumbSeparator className="hidden md:block"/> | ||
| <BreadcrumbItem> | ||
| <BreadcrumbPage>{currentMenu}</BreadcrumbPage> | ||
| </BreadcrumbItem> | ||
| </BreadcrumbList> | ||
| </Breadcrumb> | ||
| </div> | ||
| {/*push this to right*/} | ||
| <div className={"flex items-center gap-4"}> | ||
| <div className="flex items-center gap-2"> | ||
| <Select | ||
| defaultValue={version} | ||
| onValueChange={(version) => { | ||
| const selectedApi = apiDetails.find( | ||
| (api) => api.version === version | ||
| ); | ||
| if (selectedApi) { | ||
| navigate( | ||
| `/apis/${apiName}/version/${version}${basePath}` | ||
| ); | ||
| } | ||
| }} | ||
| > | ||
| <SelectTrigger> | ||
| <SelectValue>{version}</SelectValue> | ||
| </SelectTrigger> | ||
| <SelectContent> | ||
| {sortedVersions.map((api) => ( | ||
| <SelectItem value={api.version} key={api.version}> | ||
| {api.version} {api.draft ? "(Draft)" : "(Published)"} | ||
| </SelectItem> | ||
| ))} | ||
| </SelectContent> | ||
| </Select> | ||
| </div> | ||
| </div> | ||
| </header> | ||
| <ErrorBoundary> | ||
| <Outlet/> | ||
| </ErrorBoundary> | ||
| </SidebarInset> | ||
| </SidebarProvider> | ||
| </ErrorBoundary> | ||
| ); | ||
| }; |
Oops, something went wrong.