Tweak some things for launch

src-tauri/yaak-license/src/license.rs

@@ -11,7 +11,7 @@ use yaak_models::queries::UpdateSource;
 
 const KV_NAMESPACE: &str = "license";
 const KV_ACTIVATION_ID_KEY: &str = "activation_id";
-const TRIAL_SECONDS: u64 = 3600 * 24 * 14;
+const TRIAL_SECONDS: u64 = 3600 * 24 * 30;
 
 #[derive(Debug, Clone, Serialize, Deserialize, TS)]
 #[serde(rename_all = "camelCase")]

src-web/commands/commands.tsx

@@ -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;

src-web/commands/deleteWebsocketRequest.tsx

@@ -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>?
         </>
       ),
     });

src-web/components/CommandPaletteDialog.tsx

@@ -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 () => {

src-web/components/DynamicForm.tsx

@@ -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({

src-web/components/GitCommitDialog.tsx

@@ -11,8 +11,8 @@ import type {
 import classNames from 'classnames';
 
 import { useMemo, useState } from 'react';
-import { fallbackRequestName } from '../lib/fallbackRequestName';
-import {showErrorToast, showToast} from '../lib/toast';
+import { resolvedModelName } from '../lib/resolvedModelName';
+import { showErrorToast, showToast } from '../lib/toast';
 import { Banner } from './core/Banner';
 import { Button } from './core/Button';
 import type { CheckboxProps } from './core/Checkbox';
@@ -43,19 +43,23 @@ export function GitCommitDialog({ syncDir, onDone, workspace }: Props) {
   const [message, setMessage] = useState<string>('');
 
   const handleCreateCommit = async () => {
-    await commit.mutateAsync({ message });
-    onDone();
+    try {
+      await commit.mutateAsync({ message });
+      onDone();
+    } catch (err) {
+      showErrorToast('git-commit-error', String(err));
+    }
   };
 
   const handleCreateCommitAndPush = async () => {
-    await commit.mutateAsync({ message });
-    await push.mutateAsync(undefined, {
-      onError(err) {
-        showErrorToast('git-push-error', String(err));
-      }
-    });
-    showToast({ id: 'git-push-success', message: 'Pushed changes', color: 'success' });
-    onDone();
+    try {
+      await commit.mutateAsync({ message });
+      await push.mutateAsync();
+      showToast({ id: 'git-push-success', message: 'Pushed changes', color: 'success' });
+      onDone();
+    } catch (err) {
+      showErrorToast('git-commit-and-push-error', String(err));
+    }
   };
 
   const { internalEntries, externalEntries, allEntries } = useMemo(() => {
@@ -145,16 +149,18 @@ export function GitCommitDialog({ syncDir, onDone, workspace }: Props) {
         firstSlot={({ style }) => (
           <div style={style} className="h-full overflow-y-auto -ml-1 pb-3">
             <TreeNodeChildren node={tree} depth={0} onCheck={checkNode} />
-            {externalEntries.length > 0 && (
-              <Separator className="mt-3 mb-1">External file changes</Separator>
+            {externalEntries.find((e) => e.status !== 'current') && (
+              <>
+                <Separator className="mt-3 mb-1">External file changes</Separator>
+                {externalEntries.map((entry) => (
+                  <ExternalTreeNode
+                    key={entry.relaPath + entry.status}
+                    entry={entry}
+                    onCheck={checkEntry}
+                  />
+                ))}
+              </>
             )}
-            {externalEntries.map((entry) => (
-              <ExternalTreeNode
-                key={entry.relaPath + entry.status}
-                entry={entry}
-                onCheck={checkEntry}
-              />
-            ))}
           </div>
         )}
         secondSlot={({ style }) => (
@@ -243,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(

src-web/components/GrpcConnectionSetupPane.tsx

@@ -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

src-web/components/HttpRequestPane.tsx

@@ -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

src-web/components/MoveToWorkspaceDialog.tsx

@@ -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>

src-web/components/RecentGrpcConnectionsDropdown.tsx

@@ -53,7 +53,7 @@ export function RecentGrpcConnectionsDropdown({
       <IconButton
         title="Show connection history"
         icon={activeConnection?.id === latestConnectionId ? 'chevron_down' : 'pin'}
-        className="m-0.5"
+        className="m-0.5 text-text-subtle"
         size="sm"
         iconSize="md"
       />

src-web/components/RecentHttpResponsesDropdown.tsx

@@ -81,7 +81,7 @@ export const RecentHttpResponsesDropdown = function ResponsePane({
       <IconButton
         title="Show response history"
         icon={activeResponse?.id === latestResponseId ? 'chevron_down' : 'pin'}
-        className="m-0.5"
+        className="m-0.5 text-text-subtle"
         size="sm"
         iconSize="md"
       />

src-web/components/RecentRequestsDropdown.tsx

@@ -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>
   );

src-web/components/RecentWebsocketConnectionsDropdown.tsx

@@ -60,7 +60,7 @@ export function RecentWebsocketConnectionsDropdown({
       <IconButton
         title="Show connection history"
         icon={activeConnection?.id === latestConnectionId ? 'chevron_down' : 'pin'}
-        className="m-0.5"
+        className="m-0.5 text-text-subtle"
         size="sm"
         iconSize="md"
       />

src-web/components/Settings/SettingsLicense.tsx

@@ -1,5 +1,5 @@
 import { useLicense } from '@yaakapp-internal/license';
-import { formatDistanceToNow } from 'date-fns';
+import { formatDistanceToNowStrict } from 'date-fns';
 import React, { useState } from 'react';
 import { useToggle } from '../../hooks/useToggle';
 import { Banner } from '../core/Banner';
@@ -30,7 +30,7 @@ export function SettingsLicense() {
           {check.data?.type === 'trialing' && (
             <p className="select-text">
               <strong>
-                You have {formatDistanceToNow(check.data.end)} remaining on your trial.
+                You have {formatDistanceToNowStrict(check.data.end)} remaining on your trial.
               </strong>
             </p>
           )}
@@ -40,11 +40,6 @@ export function SettingsLicense() {
               Learn More
             </Link>
           </p>
-          <p className="select-text">
-            This supports future development and ensures continued growth and improvement. Personal
-            use and running the open-source code directly require no license.
-          </p>
-          <p>~ Gregory</p>
         </Banner>
       )}
 

src-web/components/WebsocketRequestPane.tsx

@@ -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

src-web/components/core/Banner.tsx

@@ -14,8 +14,8 @@ export function Banner({ children, className, color }: Props) {
         className,
         `x-theme-banner--${color}`,
         'whitespace-pre-wrap',
-        'border border-dashed border-border bg-surface',
-        'px-3 py-2 rounded select-auto',
+        'border border-border bg-surface',
+        'px-4 py-3 rounded-lg select-auto',
         'overflow-auto h-auto mb-auto text-text',
       )}
     >

src-web/components/core/Button.tsx

@@ -136,7 +136,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
         {children}
       </div>
       {rightSlot && <div className="ml-1">{rightSlot}</div>}
-      {forDropdown && <Icon icon="chevron_down" size={size} className="ml-1 -mr-1" />}
+      {forDropdown && <Icon icon="check" size={size} className="ml-1 -mr-1" />}
     </button>
   );
 });

src-web/components/core/Tabs/Tabs.tsx

@@ -121,7 +121,10 @@ export function Tabs({
                     <Icon
                       size="sm"
                       icon="chevron_down"
-                      className={classNames('ml-1', !isActive && 'opacity-50')}
+                      className={classNames(
+                        'ml-1',
+                        isActive ? 'text-text-subtle' : 'text-text-subtlest',
+                      )}
                     />
                   </button>
                 </RadioDropdown>

src-web/components/sidebar/SidebarAtoms.ts

@@ -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,
   }));

src-web/hooks/useDeleteAnyGrpcRequest.tsx

@@ -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>?
           </>
         ),
       });

src-web/hooks/useDeleteAnyHttpRequest.tsx

@@ -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>?
           </>
         ),
       });

src-web/hooks/useSyncWorkspaceRequestTitle.ts

@@ -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) {

src-web/lib/resolvedModelName.ts

@@ -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(' / ');
+}

src-web/lib/theme/window.ts

@@ -113,8 +113,8 @@ function bannerColorVariables(color: YaakColor): Partial<CSSVariables> {
     text: color.lift(0.8),
     textSubtle: color.translucify(0.3),
     textSubtlest: color,
-    surface: color.translucify(0.9),
-    border: color.lift(0.3).translucify(0.4),
+    surface: color.translucify(0.95),
+    border: color.lift(0.3).translucify(0.8),
   };
 }