starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-01-18 17:47:37 +01:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Show folders in sync confirm dialog

Browse Source
This commit is contained in:
Gregory Schier
2025-02-09 08:35:29 -08:00
parent 325c88f251
commit 3aaa0355e1
15 changed files with 58 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src-web/commands/commands.tsx
View File

@@ -7,7 +7,7 @@ import { getActiveWorkspaceId } from '../hooks/useActiveWorkspace';
import { createFastMutation } from '../hooks/useFastMutation';
import { trackEvent } from '../lib/analytics';
import { showConfirm } from '../lib/confirm';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelNameWithFolders } from '../lib/resolvedModelName';
import { pluralizeCount } from '../lib/pluralize';
import { showPrompt } from '../lib/prompt';
import { invokeCmd } from '../lib/tauri';
@@ -70,14 +70,15 @@ export const syncWorkspace = createFastMutation<
(o) => o.type === 'dbDelete' && o.model.model === 'workspace',
);
console.log('Filesystem changes detected', { dbOps, ops });
console.log('Directory changes detected', { dbOps, ops });
const confirmed = force
? true
: await showConfirm({
id: 'commit-sync',
title: 'Filesystem Changes Detected',
title: 'Changes Detected',
confirmText: 'Apply Changes',
color: isDeletingWorkspace ? 'danger' : 'primary',
description: (
<VStack space={3}>
{isDeletingWorkspace && (
@@ -86,8 +87,8 @@ export const syncWorkspace = createFastMutation<
</Banner>
)}
<p>
{pluralizeCount('file', dbOps.length)} in the directory have changed. Do you want to
apply the updates to your workspace?
{pluralizeCount('file', dbOps.length)} in the directory{' '}
{dbOps.length === 1 ? 'has' : 'have'} changed. Do you want to update your workspace?
</p>
<div className="overflow-y-auto max-h-[10rem]">
<table className="w-full text-sm mb-auto min-w-full max-w-full divide-y divide-surface-highlight">
@@ -105,15 +106,15 @@ export const syncWorkspace = createFastMutation<
if (op.type === 'dbCreate') {
label = 'create';
name = fallbackRequestName(op.fs.model);
name = resolvedModelNameWithFolders(op.fs.model);
color = 'text-success';
} else if (op.type === 'dbUpdate') {
label = 'update';
name = fallbackRequestName(op.fs.model);
name = resolvedModelNameWithFolders(op.fs.model);
color = 'text-info';
} else if (op.type === 'dbDelete') {
label = 'delete';
name = fallbackRequestName(op.model);
name = resolvedModelNameWithFolders(op.model);
color = 'text-danger';
} else {
return null;

4
src-web/commands/deleteWebsocketRequest.tsx
View File

@@ -4,7 +4,7 @@ import { InlineCode } from '../components/core/InlineCode';
import { createFastMutation } from '../hooks/useFastMutation';
import { trackEvent } from '../lib/analytics';
import { showConfirmDelete } from '../lib/confirm';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
export const deleteWebsocketRequest = createFastMutation({
mutationKey: ['delete_websocket_request'],
@@ -14,7 +14,7 @@ export const deleteWebsocketRequest = createFastMutation({
title: 'Delete WebSocket Request',
description: (
<>
Permanently delete <InlineCode>{fallbackRequestName(request)}</InlineCode>?
Permanently delete <InlineCode>{resolvedModelName(request)}</InlineCode>?
</>
),
});

6
src-web/components/CommandPaletteDialog.tsx
View File

@@ -28,7 +28,7 @@ import { useSendAnyHttpRequest } from '../hooks/useSendAnyHttpRequest';
import { useSidebarHidden } from '../hooks/useSidebarHidden';
import { useWorkspaces } from '../hooks/useWorkspaces';
import { showDialog, toggleDialog } from '../lib/dialog';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelNameWithFolders } from '../lib/resolvedModelName';
import { router } from '../lib/router';
import { setWorkspaceSearchParams } from '../lib/setWorkspaceSearchParams';
import { CookieDialog } from './CookieDialog';
@@ -270,11 +270,11 @@ export function CommandPaletteDialog({ onClose }: { onClose: () => void }) {
for (const r of sortedRequests) {
requestGroup.items.push({
key: `switch-request-${r.id}`,
searchText: fallbackRequestName(r),
searchText: resolvedModelNameWithFolders(r),
label: (
<HStack space={2}>
<HttpMethodTag className="text-text-subtlest" request={r} />
<div className="truncate">{fallbackRequestName(r)}</div>
<div className="truncate">{resolvedModelNameWithFolders(r)}</div>
</HStack>
),
onSelect: async () => {

4
src-web/components/DynamicForm.tsx
View File

@@ -15,7 +15,7 @@ import { useActiveRequest } from '../hooks/useActiveRequest';
import { useFolders } from '../hooks/useFolders';
import { useHttpRequests } from '../hooks/useHttpRequests';
import { capitalize } from '../lib/capitalize';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { Banner } from './core/Banner';
import { Checkbox } from './core/Checkbox';
import { Editor } from './core/Editor/Editor';
@@ -386,7 +386,7 @@ function buildRequestBreadcrumbs(request: HttpRequest, folders: Folder[]): strin
};
next();
return ancestors.map((a) => (a.model === 'folder' ? a.name : fallbackRequestName(a)));
return ancestors.map((a) => (a.model === 'folder' ? a.name : resolvedModelName(a)));
}
function CheckboxArg({

4
src-web/components/GitCommitDialog.tsx
View File

@@ -11,7 +11,7 @@ import type {
import classNames from 'classnames';
import { useMemo, useState } from 'react';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { showErrorToast, showToast } from '../lib/toast';
import { Banner } from './core/Banner';
import { Button } from './core/Button';
@@ -249,7 +249,7 @@ function TreeNodeChildren({
) : (
<span aria-hidden />
)}
<div className="truncate">{fallbackRequestName(node.model)}</div>
<div className="truncate">{resolvedModelName(node.model)}</div>
{node.status.status !== 'current' && (
<InlineCode
className={classNames(

4
src-web/components/GrpcConnectionSetupPane.tsx
View File

@@ -9,7 +9,7 @@ import type { ReflectResponseService } from '../hooks/useGrpc';
import { useHttpAuthenticationSummaries } from '../hooks/useHttpAuthentication';
import { useRequestUpdateKey } from '../hooks/useRequestUpdateKey';
import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { Button } from './core/Button';
import { CountBadge } from './core/CountBadge';
import { Icon } from './core/Icon';
@@ -343,7 +343,7 @@ export function GrpcConnectionSetupPane({
defaultValue={activeRequest.name}
className="font-sans !text-xl !px-0"
containerClassName="border-0"
placeholder={fallbackRequestName(activeRequest)}
placeholder={resolvedModelName(activeRequest)}
onChange={(name) => updateRequest.mutate({ id: activeRequest.id, update: { name } })}
/>
<MarkdownEditor

4
src-web/components/HttpRequestPane.tsx
View File

@@ -20,7 +20,7 @@ import { useSendAnyHttpRequest } from '../hooks/useSendAnyHttpRequest';
import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest';
import { deepEqualAtom } from '../lib/atoms';
import { languageFromContentType } from '../lib/contentType';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { generateId } from '../lib/generateId';
import {
BODY_TYPE_BINARY,
@@ -468,7 +468,7 @@ export function HttpRequestPane({ style, fullHeight, className, activeRequest }:
defaultValue={activeRequest.name}
className="font-sans !text-xl !px-0"
containerClassName="border-0"
placeholder={fallbackRequestName(activeRequest)}
placeholder={resolvedModelName(activeRequest)}
onChange={(name) => updateRequest({ id: activeRequestId, update: { name } })}
/>
<MarkdownEditor

4
src-web/components/MoveToWorkspaceDialog.tsx
View File

@@ -4,7 +4,7 @@ import { upsertWebsocketRequest } from '../commands/upsertWebsocketRequest';
import { useUpdateAnyGrpcRequest } from '../hooks/useUpdateAnyGrpcRequest';
import { useUpdateAnyHttpRequest } from '../hooks/useUpdateAnyHttpRequest';
import { useWorkspaces } from '../hooks/useWorkspaces';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { router } from '../lib/router';
import { showToast } from '../lib/toast';
import { Button } from './core/Button';
@@ -59,7 +59,7 @@ export function MoveToWorkspaceDialog({ onDone, request, activeWorkspaceId }: Pr
id: 'workspace-moved',
message: (
<>
<InlineCode>{fallbackRequestName(request)}</InlineCode> moved to{' '}
<InlineCode>{resolvedModelName(request)}</InlineCode> moved to{' '}
<InlineCode>
{workspaces.find((w) => w.id === selectedWorkspaceId)?.name ?? 'unknown'}
</InlineCode>

6
src-web/components/RecentRequestsDropdown.tsx
View File

@@ -6,7 +6,7 @@ import { useHotKey } from '../hooks/useHotKey';
import { useKeyboardEvent } from '../hooks/useKeyboardEvent';
import { useRecentRequests } from '../hooks/useRecentRequests';
import { requestsAtom } from '../hooks/useRequests';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { jotaiStore } from '../lib/jotai';
import { router } from '../lib/router';
import { Button } from './core/Button';
@@ -57,7 +57,7 @@ export function RecentRequestsDropdown({ className }: Props) {
if (request === undefined) continue;
recentRequestItems.push({
label: fallbackRequestName(request),
label: resolvedModelName(request),
leftSlot: <HttpMethodTag request={request} />,
onSelect: async () => {
await router.navigate({
@@ -94,7 +94,7 @@ export function RecentRequestsDropdown({ className }: Props) {
activeRequest == null && 'text-text-subtlest italic',
)}
>
{fallbackRequestName(activeRequest)}
{resolvedModelName(activeRequest)}
</Button>
</Dropdown>
);

4
src-web/components/WebsocketRequestPane.tsx
View File

@@ -21,7 +21,7 @@ import { useLatestWebsocketConnection } from '../hooks/useWebsocketConnections';
import { trackEvent } from '../lib/analytics';
import { deepEqualAtom } from '../lib/atoms';
import { languageFromContentType } from '../lib/contentType';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { generateId } from '../lib/generateId';
import { CountBadge } from './core/CountBadge';
import { Editor } from './core/Editor/Editor';
@@ -303,7 +303,7 @@ export function WebsocketRequestPane({ style, fullHeight, className, activeReque
defaultValue={activeRequest.name}
className="font-sans !text-xl !px-0"
containerClassName="border-0"
placeholder={fallbackRequestName(activeRequest)}
placeholder={resolvedModelName(activeRequest)}
onChange={(name) => upsertWebsocketRequest.mutate({ ...activeRequest, name })}
/>
<MarkdownEditor

4
src-web/components/sidebar/SidebarAtoms.ts
View File

@@ -6,7 +6,7 @@ import { activeWorkspaceAtom } from '../../hooks/useActiveWorkspace';
import { foldersAtom } from '../../hooks/useFolders';
import { requestsAtom } from '../../hooks/useRequests';
import { deepEqualAtom } from '../../lib/atoms';
import { fallbackRequestName } from '../../lib/fallbackRequestName';
import { resolvedModelName } from '../../lib/resolvedModelName';
import type { SidebarTreeNode } from './Sidebar';
export const sidebarSelectedIdAtom = atom<string | null>(null);
@@ -18,7 +18,7 @@ const allPotentialChildrenAtom = atom((get) => {
id: v.id,
model: v.model,
folderId: v.folderId,
name: fallbackRequestName(v),
name: resolvedModelName(v),
workspaceId: v.workspaceId,
sortPriority: v.sortPriority,
}));

4
src-web/hooks/useDeleteAnyGrpcRequest.tsx
View File

@@ -2,7 +2,7 @@ import type { GrpcRequest } from '@yaakapp-internal/models';
import { InlineCode } from '../components/core/InlineCode';
import { trackEvent } from '../lib/analytics';
import { showConfirmDelete } from '../lib/confirm';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { invokeCmd } from '../lib/tauri';
import { useFastMutation } from './useFastMutation';
@@ -15,7 +15,7 @@ export function useDeleteAnyGrpcRequest() {
title: 'Delete Request',
description: (
<>
Permanently delete <InlineCode>{fallbackRequestName(request)}</InlineCode>?
Permanently delete <InlineCode>{resolvedModelName(request)}</InlineCode>?
</>
),
});

4
src-web/hooks/useDeleteAnyHttpRequest.tsx
View File

@@ -2,7 +2,7 @@ import type { HttpRequest } from '@yaakapp-internal/models';
import { InlineCode } from '../components/core/InlineCode';
import { trackEvent } from '../lib/analytics';
import { showConfirmDelete } from '../lib/confirm';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { invokeCmd } from '../lib/tauri';
import { useFastMutation } from './useFastMutation';
@@ -15,7 +15,7 @@ export function useDeleteAnyHttpRequest() {
title: 'Delete Request',
description: (
<>
Permanently delete <InlineCode>{fallbackRequestName(request)}</InlineCode>?
Permanently delete <InlineCode>{resolvedModelName(request)}</InlineCode>?
</>
),
});

4
src-web/hooks/useSyncWorkspaceRequestTitle.ts
View File

@@ -1,7 +1,7 @@
import { emit } from '@tauri-apps/api/event';
import { getCurrentWebviewWindow } from '@tauri-apps/api/webviewWindow';
import { useEffect } from 'react';
import { fallbackRequestName } from '../lib/fallbackRequestName';
import { resolvedModelName } from '../lib/resolvedModelName';
import { useActiveEnvironment } from './useActiveEnvironment';
import { getActiveRequest } from './useActiveRequest';
import { useActiveWorkspace } from './useActiveWorkspace';
@@ -26,7 +26,7 @@ export function useSyncWorkspaceRequestTitle() {
const activeRequest = getActiveRequest();
if (activeRequest) {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
newTitle += ` › ${fallbackRequestName(activeRequest)}`;
newTitle += ` › ${resolvedModelName(activeRequest)}`;
}
if (appInfo.isDev) {

22
src-web/lib/fallbackRequestName.ts → src-web/lib/resolvedModelName.ts
View File

@@ -1,6 +1,8 @@
import type { AnyModel } from '@yaakapp-internal/models';
import { foldersAtom } from '../hooks/useFolders';
import { jotaiStore } from './jotai';
export function fallbackRequestName(r: AnyModel | null): string {
export function resolvedModelName(r: AnyModel | null): string {
if (r == null) return '';
if (!('url' in r) || r.model === 'plugin') {
@@ -33,3 +35,21 @@ export function fallbackRequestName(r: AnyModel | null): string {
return withoutProto;
}
export function resolvedModelNameWithFolders(model: AnyModel | null): string {
if (model == null) return '';
const folders = jotaiStore.get(foldersAtom) ?? [];
const getParents = (m: AnyModel, names: string[]) => {
names = [...names, resolvedModelName(m)];
if ('folderId' in m) {
const parent = folders.find((f) => f.id === m.folderId);
if (parent) {
names = [resolvedModelName(parent), ...names];
}
}
return names;
};
return getParents(model, []).join(' / ');
}