diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 76a3f00f100..cce75c92515 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -85,7 +85,7 @@ services: retries: 3 volumes: - ./.hive-dev/clickhouse/logs:/var/log/clickhouse-server - - ./.hive-dev/clickhouse/db:/var/lib/clickhouse + - clickhouse_data:/var/lib/clickhouse - ./configs/clickhouse:/etc/clickhouse-server/conf.d ports: - '8123:8123' @@ -281,3 +281,6 @@ services: networks: stack: {} + +volumes: + clickhouse_data: diff --git a/packages/libraries/external-composition/build-example.mjs b/packages/libraries/external-composition/build-example.mjs index 477456d9c29..39f8103d637 100644 --- a/packages/libraries/external-composition/build-example.mjs +++ b/packages/libraries/external-composition/build-example.mjs @@ -1,6 +1,6 @@ /* eslint-disable */ import { readFileSync } from 'fs'; -import { dirname, join } from 'path'; +import { dirname, join, sep } from 'path'; import { fileURLToPath } from 'url'; import { build as tsup } from 'tsup'; @@ -8,7 +8,7 @@ const __dirname = dirname(fileURLToPath(import.meta.url)); const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf8')); await tsup({ - entry: [join(__dirname, 'example.mjs')], + entry: [join(__dirname, 'example.mjs').split(sep).join('/')], outDir: join(__dirname, 'dist'), target: 'node22', format: ['esm'], diff --git a/packages/web/app/src/components/target/history/errors-and-changes.tsx b/packages/web/app/src/components/target/history/errors-and-changes.tsx index d44183d1209..6d6a08837b0 100644 --- a/packages/web/app/src/components/target/history/errors-and-changes.tsx +++ b/packages/web/app/src/components/target/history/errors-and-changes.tsx @@ -8,7 +8,7 @@ import { Accordion, AccordionContent, AccordionHeader, - AccordionItem, + AccordionItem,2 AccordionTrigger, } from '@/components/ui/accordion'; import { Button } from '@/components/ui/button'; @@ -79,6 +79,7 @@ const ChangesBlock_SchemaChangeWithUsageFragment = graphql(` message(withSafeBasedOnUsageNote: false) severityLevel severityReason + criticalityReason approval { ...ChangesBlock_SchemaChangeApprovalFragment } @@ -128,6 +129,8 @@ export const ChangesBlock_SchemaChangeFragment = graphql(` message(withSafeBasedOnUsageNote: false) severityLevel severityReason + criticalityReason + approval { ...ChangesBlock_SchemaChangeApprovalFragment } @@ -243,6 +246,16 @@ function ChangeItem( Safe based on usage data )} + {change.isSafeBasedOnUsage && change.criticalityReason && ( + + ({change.criticalityReason}) + + )} + + + + + {'usageStatistics' in change && change.usageStatistics && ( <> {' '} diff --git a/packages/web/app/src/server/index.ts b/packages/web/app/src/server/index.ts index 962b40a54f7..dfc3e4a6f8b 100644 --- a/packages/web/app/src/server/index.ts +++ b/packages/web/app/src/server/index.ts @@ -1,4 +1,5 @@ import { resolve } from 'node:path'; +import { fileURLToPath } from 'node:url'; import Fastify from 'fastify'; import cors from '@fastify/cors'; import FastifyStatic from '@fastify/static'; @@ -7,7 +8,7 @@ import { connectGithub } from './github'; import { connectLab } from './lab'; import { connectSlack } from './slack'; -const __dirname = new URL('.', import.meta.url).pathname; +const __dirname = fileURLToPath(new URL('.', import.meta.url)); /** * Whether the server is running in development mode. * See the ./dev.ts file diff --git a/packages/web/app/vite.config.ts b/packages/web/app/vite.config.ts index f6e1755b72b..32fec2a9670 100644 --- a/packages/web/app/vite.config.ts +++ b/packages/web/app/vite.config.ts @@ -1,4 +1,5 @@ -import { resolve } from 'node:path'; +import { resolve, sep } from 'node:path'; +import { fileURLToPath } from 'node:url'; import type { Plugin, UserConfig } from 'vite'; import monacoEditor from 'vite-plugin-monaco-editor'; import tsconfigPaths from 'vite-tsconfig-paths'; @@ -7,7 +8,7 @@ import { sentryVitePlugin } from '@sentry/vite-plugin'; import tailwindcss from '@tailwindcss/vite'; import react from '@vitejs/plugin-react'; -const __dirname = new URL('.', import.meta.url).pathname; +const __dirname = fileURLToPath(new URL('.', import.meta.url)); // Add react-scan in local development mode const reactScanPlugin: Plugin = { @@ -52,8 +53,8 @@ export default { outDir: 'dist', rollupOptions: { input: { - index: resolve(__dirname, 'index.html'), - ['preflight-worker-embed']: resolve(__dirname, 'preflight-worker-embed.html'), + index: resolve(__dirname, 'index.html').split(sep).join('/'), + ['preflight-worker-embed']: resolve(__dirname, 'preflight-worker-embed.html').split(sep).join('/'), }, }, }, diff --git a/scripts/runify.ts b/scripts/runify.ts index 47cdf871e32..c57403b37ba 100644 --- a/scripts/runify.ts +++ b/scripts/runify.ts @@ -90,7 +90,7 @@ async function compile( await tsup({ entryPoints: (Array.isArray(entryPoint) ? entryPoint : [entryPoint]).map(entryPoint => - normalize(join(cwd, entryPoint)), + normalize(join(cwd, entryPoint)).split(sep).join('/'), ), outDir: out, target: 'node22',