mirror of
https://github.com/mountain-loop/yaak.git
synced 2026-04-10 03:03:37 +02:00
Recent requests/workspaces. Closes #1
This commit is contained in:
@@ -7,7 +7,7 @@ import RouteError from './RouteError';
|
|||||||
import Workspace from './Workspace';
|
import Workspace from './Workspace';
|
||||||
import Workspaces from './Workspaces';
|
import Workspaces from './Workspaces';
|
||||||
import { DialogProvider } from './DialogContext';
|
import { DialogProvider } from './DialogContext';
|
||||||
import { useActiveEnvironmentId } from '../hooks/useActiveEnvironmentId';
|
import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
|
||||||
|
|
||||||
const router = createBrowserRouter([
|
const router = createBrowserRouter([
|
||||||
{
|
{
|
||||||
@@ -47,8 +47,8 @@ export function AppRouter() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function WorkspaceOrRedirect() {
|
function WorkspaceOrRedirect() {
|
||||||
const environmentId = useActiveEnvironmentId();
|
|
||||||
const recentRequests = useRecentRequests();
|
const recentRequests = useRecentRequests();
|
||||||
|
const recentEnvironments = useRecentEnvironments();
|
||||||
const requests = useRequests();
|
const requests = useRequests();
|
||||||
const request = requests.find((r) => r.id === recentRequests[0]);
|
const request = requests.find((r) => r.id === recentRequests[0]);
|
||||||
const routes = useAppRoutes();
|
const routes = useAppRoutes();
|
||||||
@@ -57,12 +57,15 @@ function WorkspaceOrRedirect() {
|
|||||||
return <Workspace />;
|
return <Workspace />;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const environmentId = recentEnvironments[0];
|
||||||
|
const { id: requestId, workspaceId } = request;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Navigate
|
<Navigate
|
||||||
to={routes.paths.request({
|
to={routes.paths.request({
|
||||||
workspaceId: request.workspaceId,
|
workspaceId,
|
||||||
environmentId: environmentId ?? undefined,
|
environmentId,
|
||||||
requestId: request.id,
|
requestId,
|
||||||
})}
|
})}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -10,8 +10,15 @@ import { DEFAULT_FONT_SIZE } from '../lib/constants';
|
|||||||
import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
|
import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
|
||||||
import type { HttpRequest, HttpResponse, Model, Workspace } from '../lib/models';
|
import type { HttpRequest, HttpResponse, Model, Workspace } from '../lib/models';
|
||||||
import { modelsEq } from '../lib/models';
|
import { modelsEq } from '../lib/models';
|
||||||
|
import { useRecentRequests } from '../hooks/useRecentRequests';
|
||||||
|
import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
|
||||||
|
import { useRecentEnvironments } from '../hooks/useRecentEnvironments';
|
||||||
|
|
||||||
export function GlobalHooks() {
|
export function GlobalHooks() {
|
||||||
|
useRecentWorkspaces();
|
||||||
|
useRecentEnvironments();
|
||||||
|
useRecentRequests();
|
||||||
|
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
const { wasUpdatedExternally } = useRequestUpdateKey(null);
|
const { wasUpdatedExternally } = useRequestUpdateKey(null);
|
||||||
|
|
||||||
|
|||||||
@@ -2,15 +2,23 @@ import { Navigate } from 'react-router-dom';
|
|||||||
import { useAppRoutes } from '../hooks/useAppRoutes';
|
import { useAppRoutes } from '../hooks/useAppRoutes';
|
||||||
import { useWorkspaces } from '../hooks/useWorkspaces';
|
import { useWorkspaces } from '../hooks/useWorkspaces';
|
||||||
import { Heading } from './core/Heading';
|
import { Heading } from './core/Heading';
|
||||||
|
import { useRecentWorkspaces } from '../hooks/useRecentWorkspaces';
|
||||||
|
|
||||||
export default function Workspaces() {
|
export default function Workspaces() {
|
||||||
const routes = useAppRoutes();
|
const routes = useAppRoutes();
|
||||||
|
const recentWorkspaceIds = useRecentWorkspaces();
|
||||||
const workspaces = useWorkspaces();
|
const workspaces = useWorkspaces();
|
||||||
const workspace = workspaces[0];
|
|
||||||
|
|
||||||
if (workspace === undefined) {
|
const loading = workspaces.length === 0 && recentWorkspaceIds.length === 0;
|
||||||
|
if (loading) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const workspaceId = recentWorkspaceIds[0] ?? workspaces[0]?.id ?? null;
|
||||||
|
|
||||||
|
if (workspaceId === null) {
|
||||||
return <Heading>There are no workspaces</Heading>;
|
return <Heading>There are no workspaces</Heading>;
|
||||||
}
|
}
|
||||||
|
|
||||||
return <Navigate to={routes.paths.workspace({ workspaceId: workspace.id })} />;
|
return <Navigate to={routes.paths.workspace({ workspaceId })} />;
|
||||||
}
|
}
|
||||||
|
|||||||
40
src-web/hooks/useRecentEnvironments.ts
Normal file
40
src-web/hooks/useRecentEnvironments.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { useEffect } from 'react';
|
||||||
|
import { createGlobalState, useEffectOnce, useLocalStorage } from 'react-use';
|
||||||
|
import { useActiveRequestId } from './useActiveRequestId';
|
||||||
|
import { useActiveWorkspaceId } from './useActiveWorkspaceId';
|
||||||
|
import { useActiveEnvironmentId } from './useActiveEnvironmentId';
|
||||||
|
|
||||||
|
const useHistoryState = createGlobalState<string[]>([]);
|
||||||
|
|
||||||
|
export function useRecentEnvironments() {
|
||||||
|
const activeWorkspaceId = useActiveWorkspaceId();
|
||||||
|
const activeEnvironmentId = useActiveEnvironmentId();
|
||||||
|
const [history, setHistory] = useHistoryState();
|
||||||
|
const [lsState, setLSState] = useLocalStorage<string[]>(
|
||||||
|
'recent_environments::' + activeWorkspaceId,
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
|
// Load local storage state on initial render
|
||||||
|
useEffectOnce(() => {
|
||||||
|
if (lsState) {
|
||||||
|
setHistory(lsState);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update local storage state when history changes
|
||||||
|
useEffect(() => {
|
||||||
|
setLSState(history);
|
||||||
|
}, [history, setLSState]);
|
||||||
|
|
||||||
|
// Set history when active request changes
|
||||||
|
useEffect(() => {
|
||||||
|
setHistory((currentHistory: string[]) => {
|
||||||
|
if (activeEnvironmentId === null) return currentHistory;
|
||||||
|
const withoutCurrentEnvironment = currentHistory.filter((id) => id !== activeEnvironmentId);
|
||||||
|
return [activeEnvironmentId, ...withoutCurrentEnvironment];
|
||||||
|
});
|
||||||
|
}, [activeEnvironmentId, setHistory]);
|
||||||
|
|
||||||
|
return history;
|
||||||
|
}
|
||||||
35
src-web/hooks/useRecentWorkspaces.ts
Normal file
35
src-web/hooks/useRecentWorkspaces.ts
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import { useEffect } from 'react';
|
||||||
|
import { createGlobalState, useEffectOnce, useLocalStorage } from 'react-use';
|
||||||
|
import { useActiveRequestId } from './useActiveRequestId';
|
||||||
|
import { useActiveWorkspaceId } from './useActiveWorkspaceId';
|
||||||
|
|
||||||
|
const useHistoryState = createGlobalState<string[]>([]);
|
||||||
|
|
||||||
|
export function useRecentWorkspaces() {
|
||||||
|
const activeWorkspaceId = useActiveWorkspaceId();
|
||||||
|
const [history, setHistory] = useHistoryState();
|
||||||
|
const [lsState, setLSState] = useLocalStorage<string[]>('recent_workspaces', []);
|
||||||
|
|
||||||
|
// Load local storage state on initial render
|
||||||
|
useEffectOnce(() => {
|
||||||
|
if (lsState) {
|
||||||
|
setHistory(lsState);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Update local storage state when history changes
|
||||||
|
useEffect(() => {
|
||||||
|
setLSState(history);
|
||||||
|
}, [history, setLSState]);
|
||||||
|
|
||||||
|
// Set history when active request changes
|
||||||
|
useEffect(() => {
|
||||||
|
setHistory((currentHistory: string[]) => {
|
||||||
|
if (activeWorkspaceId === null) return currentHistory;
|
||||||
|
const withoutCurrentWorkspace = currentHistory.filter((id) => id !== activeWorkspaceId);
|
||||||
|
return [activeWorkspaceId, ...withoutCurrentWorkspace];
|
||||||
|
});
|
||||||
|
}, [activeWorkspaceId, setHistory]);
|
||||||
|
|
||||||
|
return history;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user