diff --git a/aidbox-ts-sdk b/aidbox-ts-sdk index 6e35e4b..6c26b19 160000 --- a/aidbox-ts-sdk +++ b/aidbox-ts-sdk @@ -1 +1 @@ -Subproject commit 6e35e4b7c1310af15d1c19cb960761c92f3b1e1c +Subproject commit 6c26b19aee1754b1861824120cafd0a8cde8463c diff --git a/package.json b/package.json index df1301c..f4561f6 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "main": "index.js", "type": "module", "scripts": { - "preinstall": "cd aidbox-ts-sdk/packages/aidbox-client && pnpm install && pnpm build && cd ../react-components && pnpm install && pnpm build", + "preinstall": "cd aidbox-ts-sdk/packages/aidbox-client && pnpm install && pnpm build && cd ../react-components && pnpm install && pnpm build && cd ../aidbox-fhirpath-lsp && pnpm install && pnpm build", "dev": "vite", "rc:build": "cd aidbox-ts-sdk/packages/react-components && pnpm build && cd ../../.. && pnpm install && rm -rf node_modules/.vite", "client:build": "cd aidbox-ts-sdk/packages/aidbox-client && pnpm build && cd ../../.. && pnpm install && rm -rf node_modules/.vite", @@ -57,14 +57,15 @@ "diff": "^8.0.3", "postcss@<8.5.10": ">=8.5.10", "@codemirror/view": "^6.42.0", - "@codemirror/autocomplete": "6.20.2" + "@codemirror/autocomplete": "6.20.2", + "@health-samurai/aidbox-client": "file:./aidbox-ts-sdk/packages/aidbox-client" } }, "dependencies": { "@git-diff-view/file": "^0.0.30", "@git-diff-view/react": "^0.0.30", "@health-samurai/aidbox-client": "file:aidbox-ts-sdk/packages/aidbox-client", - "@health-samurai/aidbox-fhirpath-lsp": "0.0.0-alpha.7", + "@health-samurai/aidbox-fhirpath-lsp": "file:aidbox-ts-sdk/packages/aidbox-fhirpath-lsp", "@health-samurai/react-components": "file:aidbox-ts-sdk/packages/react-components", "@mcp-b/global": "^2.1.0", "@replit/codemirror-vim": "^6.3.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1301f9b..4d6ffb4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -14,6 +14,7 @@ overrides: postcss@<8.5.10: '>=8.5.10' '@codemirror/view': ^6.42.0 '@codemirror/autocomplete': 6.20.2 + '@health-samurai/aidbox-client': file:./aidbox-ts-sdk/packages/aidbox-client importers: @@ -29,8 +30,8 @@ importers: specifier: file:aidbox-ts-sdk/packages/aidbox-client version: file:aidbox-ts-sdk/packages/aidbox-client '@health-samurai/aidbox-fhirpath-lsp': - specifier: 0.0.0-alpha.7 - version: 0.0.0-alpha.7(@codemirror/lsp-client@6.2.2)(@codemirror/state@6.6.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3) + specifier: file:aidbox-ts-sdk/packages/aidbox-fhirpath-lsp + version: file:aidbox-ts-sdk/packages/aidbox-fhirpath-lsp(@codemirror/lsp-client@6.2.2)(@codemirror/state@6.6.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3) '@health-samurai/react-components': specifier: file:aidbox-ts-sdk/packages/react-components version: file:aidbox-ts-sdk/packages/react-components(@types/react-dom@19.2.0(@types/react@19.2.0))(@types/react@19.2.0)(react-is@19.2.4)(redux@5.0.1) @@ -577,14 +578,11 @@ packages: react: '*' react-dom: '*' - '@health-samurai/aidbox-client@0.0.0-alpha.5': - resolution: {integrity: sha512-WYXfTgMAMRRvJPhnSjB7KiOMhgQ7CDEOS7IUJDvPsjWUbIrRVzfjl89UzyDw6Rv/kum3nDIcVZHyHjVoWbms6g==} - '@health-samurai/aidbox-client@file:aidbox-ts-sdk/packages/aidbox-client': resolution: {directory: aidbox-ts-sdk/packages/aidbox-client, type: directory} - '@health-samurai/aidbox-fhirpath-lsp@0.0.0-alpha.7': - resolution: {integrity: sha512-AX3f07EMoZg8OWduVWq6rx5HOk+h7ISj6dIgMmaHLLZJ3wcH+LHjAfPv1H6Q/Hc1kqMx+xyfX68z1AOaqGnANw==} + '@health-samurai/aidbox-fhirpath-lsp@file:aidbox-ts-sdk/packages/aidbox-fhirpath-lsp': + resolution: {directory: aidbox-ts-sdk/packages/aidbox-fhirpath-lsp, type: directory} peerDependencies: '@codemirror/lsp-client': ^6.2.0 '@codemirror/state': ^6.5.2 @@ -2982,7 +2980,7 @@ snapshots: '@codemirror/autocomplete': 6.20.2 '@codemirror/commands': 6.10.3 '@codemirror/language': 6.12.2 - '@codemirror/lint': 6.9.5 + '@codemirror/lint': 6.9.6 '@codemirror/search': 6.6.0 '@codemirror/state': 6.6.0 '@codemirror/theme-one-dark': 6.1.3 @@ -3404,25 +3402,19 @@ snapshots: react: 19.2.4 react-dom: 19.2.4(react@19.2.4) - '@health-samurai/aidbox-client@0.0.0-alpha.5': - dependencies: - '@types/json-patch': 0.0.33 - oauth4webapi: 3.8.5 - yaml: 2.8.3 - '@health-samurai/aidbox-client@file:aidbox-ts-sdk/packages/aidbox-client': dependencies: '@types/json-patch': 0.0.33 oauth4webapi: 3.8.5 yaml: 2.8.3 - '@health-samurai/aidbox-fhirpath-lsp@0.0.0-alpha.7(@codemirror/lsp-client@6.2.2)(@codemirror/state@6.6.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)': + '@health-samurai/aidbox-fhirpath-lsp@file:aidbox-ts-sdk/packages/aidbox-fhirpath-lsp(@codemirror/lsp-client@6.2.2)(@codemirror/state@6.6.0)(react-dom@19.2.4(react@19.2.4))(react@19.2.4)(typescript@5.9.3)': dependencies: '@atomic-ehr/fhirpath': 0.1.4(typescript@5.9.3) '@atomic-ehr/fhirpath-lsp': 0.0.7(typescript@5.9.3) '@codemirror/lsp-client': 6.2.2 '@codemirror/state': 6.6.0 - '@health-samurai/aidbox-client': 0.0.0-alpha.5 + '@health-samurai/aidbox-client': file:aidbox-ts-sdk/packages/aidbox-client react: 19.2.4 react-dom: 19.2.4(react@19.2.4) transitivePeerDependencies: @@ -4979,7 +4971,7 @@ snapshots: '@codemirror/autocomplete': 6.20.2 '@codemirror/commands': 6.10.3 '@codemirror/language': 6.12.2 - '@codemirror/lint': 6.9.5 + '@codemirror/lint': 6.9.6 '@codemirror/search': 6.6.0 '@codemirror/state': 6.6.0 '@codemirror/view': 6.42.1 diff --git a/src/routes/analytics.index.tsx b/src/routes/analytics.index.tsx index 301b7ed..f6f65bb 100644 --- a/src/routes/analytics.index.tsx +++ b/src/routes/analytics.index.tsx @@ -460,12 +460,6 @@ export function AnalyticsListPage({ } }, []); - const loading = - kind === "view" - ? views.isLoading - : kind === "query" - ? queries.isLoading - : views.isLoading || queries.isLoading; const combined: RecentItem[] = [ ...(views.data ?? []), ...(queries.data ?? []), @@ -531,16 +525,6 @@ export function AnalyticsListPage({ }) : tagFiltered; - if (loading) { - return ( -