@cobaltcore-dev/aurora 0.14.1 → 0.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -57,7 +57,7 @@ var a = (t, n) => {
57
57
  }
58
58
  });
59
59
  }
60
- }, o = () => import("./objects-o2Cj_ndZ.mjs"), s = () => import("./objects-DjDr_S5Q.mjs"), c = i.object({
60
+ }, o = () => import("./objects-o2Cj_ndZ.mjs"), s = () => import("./objects-Deo1Ic1A.mjs"), c = i.object({
61
61
  prefix: i.string().optional(),
62
62
  sortBy: i.enum([
63
63
  "name",
@@ -65,8 +65,8 @@ var a = (t, n) => {
65
65
  "bytes",
66
66
  "lastModified",
67
67
  "size"
68
- ]).optional(),
69
- sortDirection: i.enum(["asc", "desc"]).optional(),
68
+ ]).optional().default("name"),
69
+ sortDirection: i.enum(["asc", "desc"]).optional().default("asc"),
70
70
  search: i.string().optional(),
71
71
  tab: i.enum(["all", "deleted"]).optional().default("all")
72
72
  }), l = t("/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/")({
@@ -100,4 +100,4 @@ var a = (t, n) => {
100
100
  //#endregion
101
101
  export { l as t };
102
102
 
103
- //# sourceMappingURL=objects-gNSKHCsp.mjs.map
103
+ //# sourceMappingURL=objects-DpgXMFrG.mjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"objects-gNSKHCsp.mjs","names":["redirect","getServiceIndex","checkServiceAvailability","availableServices","params","provider","projectId","storageType","containerName","serviceIndex","to","hasSwift","Boolean","hasCeph","cephFallbackEnabled","hasEffectiveCeph","fallbackProvider","fallbackStorageType","expectedStorageType","createFileRoute","checkServiceAvailability","z","objectsSearchSchema","object","prefix","string","optional","sortBy","enum","sortDirection","search","tab","default","Route","staticData","section","service","analytics","name","isDetail","sectionCrumb","labelKey","crumb","useParamAsLabel","to","RouteInfo","validateSearch","head","match","meta","title","params","containerName","component","lazyRouteComponent","$$splitComponentImporter","notFoundComponent","$$splitNotFoundComponentImporter","loader","context","trpcClient","availableServices","auth","getAvailableServices","query","client","beforeLoad"],"sources":["../../src/client/routes/_auth/projects/$projectId/storage/-components/utils/serviceAvailability.ts","../../src/client/routes/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/index.tsx"],"sourcesContent":["import { redirect } from \"@tanstack/react-router\"\nimport { getServiceIndex } from \"@/server/Authentication/helpers\"\n\ninterface ServiceInfo {\n type: string\n name: string\n}\n\ninterface RouteParams {\n projectId: string\n provider: string\n storageType: string\n containerName: string\n}\n\n/**\n * Validates storage service availability and redirects to appropriate provider/storage type.\n *\n * Redirect logic:\n * 1. If no object-store services available → redirect to project overview\n * 2. If provider is invalid → redirect to fallback provider (swift → ceph)\n * 3. If provider unavailable → redirect to available alternative\n * 4. If storageType doesn't match provider → canonicalize URL\n *\n * @throws redirect - TanStack Router redirect on validation failure\n */\nexport const checkServiceAvailability = (availableServices: ServiceInfo[], params: RouteParams) => {\n const { provider, projectId, storageType, containerName } = params\n\n const serviceIndex = getServiceIndex(availableServices)\n\n // Redirect to the \"Projects Overview\" page if no storage services available\n if (!serviceIndex[\"object-store\"]) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n\n // Check provider availability\n const hasSwift = Boolean(serviceIndex[\"object-store\"][\"swift\"])\n const hasCeph = Boolean(serviceIndex[\"object-store\"][\"ceph\"])\n\n // TEMPORARY: Allow Ceph access even if not in catalog (relies on env config)\n // TODO: Properly register Ceph in OpenStack service catalog\n const cephFallbackEnabled = true // Set to false once Ceph is in catalog\n\n // Effective availability includes fallback flag for Ceph\n const hasEffectiveCeph = hasCeph || cephFallbackEnabled\n const fallbackProvider = hasSwift ? \"swift\" : hasEffectiveCeph ? \"ceph\" : null\n const fallbackStorageType = hasSwift ? \"containers\" : hasEffectiveCeph ? \"buckets\" : null\n\n if (provider !== \"swift\" && provider !== \"ceph\") {\n if (!fallbackProvider || !fallbackStorageType) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider: fallbackProvider, storageType: fallbackStorageType, containerName },\n })\n }\n\n if (provider === \"swift\" && !hasSwift) {\n if (!hasEffectiveCeph) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider: \"ceph\", storageType: \"buckets\", containerName },\n })\n }\n\n if (provider === \"ceph\" && !hasEffectiveCeph) {\n if (!hasSwift) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider: \"swift\", storageType: \"containers\", containerName },\n })\n }\n\n // Canonicalize the URL terminology for the resolved provider. Availability is\n // already settled above, so by this point provider is a valid, available\n // swift|ceph. The storageType segment is user-controllable and the router never\n // validates it, so a mismatched noun (e.g. ceph + \"containers\", swift + \"buckets\")\n // must redirect to the canonical path to keep URLs normalized.\n if (provider === \"swift\" || provider === \"ceph\") {\n const expectedStorageType = provider === \"swift\" ? \"containers\" : \"buckets\"\n if (storageType !== expectedStorageType) {\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider, storageType: expectedStorageType, containerName },\n })\n }\n }\n}\n","import { createFileRoute, useParams } from \"@tanstack/react-router\"\nimport { checkServiceAvailability } from \"../../../../-components/utils/serviceAvailability\"\nimport { ErrorBoundary } from \"react-error-boundary\"\nimport { Trans } from \"@lingui/react/macro\"\nimport { SwiftObjects } from \"../../../../-components/Swift/Objects\"\nimport { CephObjects } from \"../../../../-components/Ceph/Objects\"\nimport { z } from \"zod\"\nimport type { RouteInfo } from \"@/client/routes/routeInfo\"\nimport { BucketHeader } from \"../../../../-components/Ceph/Buckets/BucketHeader\"\n\n// Search params schema\n// - prefix: base64-encoded current folder path, safe to carry \"/\" chars in the URL\n// - sortBy: active sort column key — persisted so deep links and back navigation restore sort state\n// Accepts both Swift keys (last_modified, bytes) and Ceph keys (lastModified, size) for compatibility\n// - sortDirection: \"asc\" | \"desc\" — persisted alongside sortBy\nconst objectsSearchSchema = z.object({\n prefix: z.string().optional(),\n sortBy: z.enum([\"name\", \"last_modified\", \"bytes\", \"lastModified\", \"size\"]).optional(),\n sortDirection: z.enum([\"asc\", \"desc\"]).optional(),\n search: z.string().optional(),\n tab: z.enum([\"all\", \"deleted\"]).optional().default(\"all\"),\n})\n\nexport const Route = createFileRoute(\n \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\"\n)({\n staticData: {\n section: \"storage\",\n service: \"containers\",\n analytics: {\n name: \"storage.objectstore.detail\",\n },\n isDetail: true,\n sectionCrumb: { labelKey: \"Storage\" },\n crumb: { useParamAsLabel: \"provider\", to: \"/projects/$projectId/storage/$provider/$storageType\" },\n } satisfies RouteInfo,\n validateSearch: objectsSearchSchema,\n head: ({ match }) => ({\n meta: [{ title: match.params.containerName }],\n }),\n component: () => {\n return <ObjectsDashboard />\n },\n notFoundComponent: () => {\n return (\n <p>\n <Trans>Storage container not found</Trans>\n </p>\n )\n },\n loader: async ({ context }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n\n return {\n client: trpcClient,\n availableServices,\n }\n },\n beforeLoad: async ({ context, params }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n checkServiceAvailability(availableServices!, params)\n },\n})\n\nfunction ObjectsDashboard() {\n const { projectId, provider, containerName } = useParams({\n from: \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\",\n select: (params) => ({\n projectId: params.projectId,\n provider: params.provider,\n containerName: params.containerName,\n }),\n })\n\n const { prefix, sortBy, sortDirection, search } = Route.useSearch()\n\n // For Ceph buckets, we show ContentHeader with badges and actions\n // For Swift containers, the component handles its own header\n const showContentHeader = provider === \"ceph\"\n\n return (\n <>\n {showContentHeader && <BucketHeader bucketName={containerName} />}\n <div>\n {projectId ? (\n <ErrorBoundary\n resetKeys={[projectId, provider, containerName, prefix, sortBy, sortDirection, search]}\n fallback={\n <div className=\"p-4 text-center\">\n <Trans>Error loading component</Trans>\n </div>\n }\n >\n {(() => {\n switch (provider) {\n case \"swift\":\n return <SwiftObjects provider={provider} containerName={containerName} />\n case \"ceph\":\n return <CephObjects bucketName={containerName} />\n default:\n return (\n <div className=\"p-4\">\n <Trans>Objects: {containerName}</Trans>\n </div>\n )\n }\n })()}\n </ErrorBoundary>\n ) : (\n <div className=\"p-4 text-center\">\n <Trans>No project selected</Trans>\n </div>\n )}\n </div>\n </>\n )\n}\n"],"mappings":";;;;AA0BA,IAAaE,KAA4BC,GAAkCC,MAAAA;CACzE,IAAM,EAAEC,aAAUC,cAAWC,gBAAaC,qBAAkBJ,GAEtDK,IAAeR,EAAgBE,CAAAA;CAGrC,IAAI,CAACM,EAAa,iBAChB,MAAMT,EAAS;EACbU,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,CAAA;CAIF,IAAMK,IAAWC,EAAQH,EAAa,gBAAgB,OAQhDM,IAPUH,EAAQH,EAAa,gBAAgB,QAOjBK,IAC9BE,IAAmBL,IAAW,UAAUI,IAAmB,SAAS,MACpEE,IAAsBN,IAAW,eAAeI,IAAmB,YAAY;CAErF,IAAIV,MAAa,WAAWA,MAAa,QAOvC,MALQL,EADJ,CAACgB,KAAoB,CAACC,IACT;EACbP,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,IAEa;EACbI,IAAI;EACJN,QAAQ;GAAEE;GAAWD,UAAUW;GAAkBT,aAAaU;GAAqBT;EAAc;CACnG,CALE;CAQJ,IAAIH,MAAa,WAAW,CAACM,GAQ3B,MAAMX,EAPDe,IAOU;EACbL,IAAI;EACJN,QAAQ;GAAEE;GAAWD,UAAU;GAAQE,aAAa;GAAWC;EAAc;CAC/E,IATiB;EACbE,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,CAAA;CASJ,IAAID,MAAa,UAAU,CAACU,GAQ1B,MAAMf,EAPDW,IAOU;EACbD,IAAI;EACJN,QAAQ;GAAEE;GAAWD,UAAU;GAASE,aAAa;GAAcC;EAAc;CACnF,IATiB;EACbE,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,CAAA;CAcJ,IAAID,MAAa,WAAWA,MAAa,QAAQ;EAC/C,IAAMa,IAAsBb,MAAa,UAAU,eAAe;EAClE,IAAIE,MAAgBW,GAClB,MAAMlB,EAAS;GACbU,IAAI;GACJN,QAAQ;IAAEE;IAAWD;IAAUE,aAAaW;IAAqBV;GAAc;EACjF,CAAA;CAEJ;AACF,2FC5FMc,IAAsBD,EAAEE,OAAO;CACnCC,QAAQH,EAAEI,OAAM,EAAGC,SAAQ;CAC3BC,QAAQN,EAAEO,KAAK;EAAC;EAAQ;EAAiB;EAAS;EAAgB;EAAO,EAAEF,SAAQ;CACnFG,eAAeR,EAAEO,KAAK,CAAC,OAAO,MAAA,CAAO,EAAEF,SAAQ;CAC/CI,QAAQT,EAAEI,OAAM,EAAGC,SAAQ;CAC3BK,KAAKV,EAAEO,KAAK,CAAC,OAAO,SAAA,CAAU,EAAEF,SAAQ,EAAGM,QAAQ,KAAA;AACrD,CAAA,GAEaC,IAAQd,EACnB,mFAAA,EACA;CACAe,YAAY;EACVC,SAAS;EACTC,SAAS;EACTC,WAAW,EACTC,MAAM,6BACR;EACAC,UAAU;EACVC,cAAc,EAAEC,UAAU,UAAU;EACpCC,OAAO;GAAEC,iBAAiB;GAAYC,IAAI;EAAsD;CAClG;CACAE,gBAAgBxB;CAChByB,OAAO,EAAEC,gBAAa,EACpBC,MAAM,CAAC,EAAEC,OAAOF,EAAMG,OAAOC,cAAc,CAAA,EAC7C;CACAC,WAASC,EAAAC,GAAA,WAAA;CAGTC,mBAAiBF,EAAAG,GAAA,mBAAA;CAOjBC,QAAQ,OAAO,EAAEC,iBAAS;EACxB,IAAM,EAAEC,kBAAeD;EAGvB,OAAO;GACLM,QAAQL;GACRC,mBAAAA,MAJ8BD,GAAYE,KAAKC,qBAAqBC,MAAAA;EAKtE;CACF;CACAE,YAAY,OAAO,EAAEP,YAASR,gBAAQ;EACpC,IAAM,EAAES,kBAAeD;EAEvBvC,EAAyByC,MADOD,GAAYE,KAAKC,qBAAqBC,MAAAA,GACzBb,CAAAA;CAC/C;AACF,CAAA"}
1
+ {"version":3,"file":"objects-DpgXMFrG.mjs","names":["redirect","getServiceIndex","checkServiceAvailability","availableServices","params","provider","projectId","storageType","containerName","serviceIndex","to","hasSwift","Boolean","hasCeph","cephFallbackEnabled","hasEffectiveCeph","fallbackProvider","fallbackStorageType","expectedStorageType","createFileRoute","checkServiceAvailability","z","objectsSearchSchema","object","prefix","string","optional","sortBy","enum","default","sortDirection","search","tab","Route","staticData","section","service","analytics","name","isDetail","sectionCrumb","labelKey","crumb","useParamAsLabel","to","RouteInfo","validateSearch","head","match","meta","title","params","containerName","component","lazyRouteComponent","$$splitComponentImporter","notFoundComponent","$$splitNotFoundComponentImporter","loader","context","trpcClient","availableServices","auth","getAvailableServices","query","client","beforeLoad"],"sources":["../../src/client/routes/_auth/projects/$projectId/storage/-components/utils/serviceAvailability.ts","../../src/client/routes/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/index.tsx"],"sourcesContent":["import { redirect } from \"@tanstack/react-router\"\nimport { getServiceIndex } from \"@/server/Authentication/helpers\"\n\ninterface ServiceInfo {\n type: string\n name: string\n}\n\ninterface RouteParams {\n projectId: string\n provider: string\n storageType: string\n containerName: string\n}\n\n/**\n * Validates storage service availability and redirects to appropriate provider/storage type.\n *\n * Redirect logic:\n * 1. If no object-store services available → redirect to project overview\n * 2. If provider is invalid → redirect to fallback provider (swift → ceph)\n * 3. If provider unavailable → redirect to available alternative\n * 4. If storageType doesn't match provider → canonicalize URL\n *\n * @throws redirect - TanStack Router redirect on validation failure\n */\nexport const checkServiceAvailability = (availableServices: ServiceInfo[], params: RouteParams) => {\n const { provider, projectId, storageType, containerName } = params\n\n const serviceIndex = getServiceIndex(availableServices)\n\n // Redirect to the \"Projects Overview\" page if no storage services available\n if (!serviceIndex[\"object-store\"]) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n\n // Check provider availability\n const hasSwift = Boolean(serviceIndex[\"object-store\"][\"swift\"])\n const hasCeph = Boolean(serviceIndex[\"object-store\"][\"ceph\"])\n\n // TEMPORARY: Allow Ceph access even if not in catalog (relies on env config)\n // TODO: Properly register Ceph in OpenStack service catalog\n const cephFallbackEnabled = true // Set to false once Ceph is in catalog\n\n // Effective availability includes fallback flag for Ceph\n const hasEffectiveCeph = hasCeph || cephFallbackEnabled\n const fallbackProvider = hasSwift ? \"swift\" : hasEffectiveCeph ? \"ceph\" : null\n const fallbackStorageType = hasSwift ? \"containers\" : hasEffectiveCeph ? \"buckets\" : null\n\n if (provider !== \"swift\" && provider !== \"ceph\") {\n if (!fallbackProvider || !fallbackStorageType) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider: fallbackProvider, storageType: fallbackStorageType, containerName },\n })\n }\n\n if (provider === \"swift\" && !hasSwift) {\n if (!hasEffectiveCeph) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider: \"ceph\", storageType: \"buckets\", containerName },\n })\n }\n\n if (provider === \"ceph\" && !hasEffectiveCeph) {\n if (!hasSwift) {\n throw redirect({\n to: \"/projects/$projectId\",\n params: { projectId },\n })\n }\n\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider: \"swift\", storageType: \"containers\", containerName },\n })\n }\n\n // Canonicalize the URL terminology for the resolved provider. Availability is\n // already settled above, so by this point provider is a valid, available\n // swift|ceph. The storageType segment is user-controllable and the router never\n // validates it, so a mismatched noun (e.g. ceph + \"containers\", swift + \"buckets\")\n // must redirect to the canonical path to keep URLs normalized.\n if (provider === \"swift\" || provider === \"ceph\") {\n const expectedStorageType = provider === \"swift\" ? \"containers\" : \"buckets\"\n if (storageType !== expectedStorageType) {\n throw redirect({\n to: \"/projects/$projectId/storage/$provider/$storageType/$containerName/objects\",\n params: { projectId, provider, storageType: expectedStorageType, containerName },\n })\n }\n }\n}\n","import { createFileRoute, useParams } from \"@tanstack/react-router\"\nimport { checkServiceAvailability } from \"../../../../-components/utils/serviceAvailability\"\nimport { ErrorBoundary } from \"react-error-boundary\"\nimport { Trans } from \"@lingui/react/macro\"\nimport { SwiftObjects } from \"../../../../-components/Swift/Objects\"\nimport { CephObjects } from \"../../../../-components/Ceph/Objects\"\nimport { z } from \"zod\"\nimport type { RouteInfo } from \"@/client/routes/routeInfo\"\nimport { BucketHeader } from \"../../../../-components/Ceph/Buckets/BucketHeader\"\n\n// Search params schema\n// - prefix: base64-encoded current folder path, safe to carry \"/\" chars in the URL\n// - sortBy: active sort column key — persisted so deep links and back navigation restore sort state\n// Accepts both Swift keys (last_modified, bytes) and Ceph keys (lastModified, size) for compatibility\n// - sortDirection: \"asc\" | \"desc\" — persisted alongside sortBy\nconst objectsSearchSchema = z.object({\n prefix: z.string().optional(),\n sortBy: z.enum([\"name\", \"last_modified\", \"bytes\", \"lastModified\", \"size\"]).optional().default(\"name\"),\n sortDirection: z.enum([\"asc\", \"desc\"]).optional().default(\"asc\"),\n search: z.string().optional(),\n tab: z.enum([\"all\", \"deleted\"]).optional().default(\"all\"),\n})\n\nexport const Route = createFileRoute(\n \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\"\n)({\n staticData: {\n section: \"storage\",\n service: \"containers\",\n analytics: {\n name: \"storage.objectstore.detail\",\n },\n isDetail: true,\n sectionCrumb: { labelKey: \"Storage\" },\n crumb: { useParamAsLabel: \"provider\", to: \"/projects/$projectId/storage/$provider/$storageType\" },\n } satisfies RouteInfo,\n validateSearch: objectsSearchSchema,\n head: ({ match }) => ({\n meta: [{ title: match.params.containerName }],\n }),\n component: () => {\n return <ObjectsDashboard />\n },\n notFoundComponent: () => {\n return (\n <p>\n <Trans>Storage container not found</Trans>\n </p>\n )\n },\n loader: async ({ context }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n\n return {\n client: trpcClient,\n availableServices,\n }\n },\n beforeLoad: async ({ context, params }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n checkServiceAvailability(availableServices!, params)\n },\n})\n\nfunction ObjectsDashboard() {\n const { projectId, provider, containerName } = useParams({\n from: \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\",\n select: (params) => ({\n projectId: params.projectId,\n provider: params.provider,\n containerName: params.containerName,\n }),\n })\n\n const { prefix, sortBy, sortDirection, search } = Route.useSearch()\n\n // For Ceph buckets, we show ContentHeader with badges and actions\n // For Swift containers, the component handles its own header\n const showContentHeader = provider === \"ceph\"\n\n return (\n <>\n {showContentHeader && <BucketHeader bucketName={containerName} />}\n <div>\n {projectId ? (\n <ErrorBoundary\n resetKeys={[projectId, provider, containerName, prefix, sortBy, sortDirection, search]}\n fallback={\n <div className=\"p-4 text-center\">\n <Trans>Error loading component</Trans>\n </div>\n }\n >\n {(() => {\n switch (provider) {\n case \"swift\":\n return <SwiftObjects provider={provider} containerName={containerName} />\n case \"ceph\":\n return <CephObjects bucketName={containerName} />\n default:\n return (\n <div className=\"p-4\">\n <Trans>Objects: {containerName}</Trans>\n </div>\n )\n }\n })()}\n </ErrorBoundary>\n ) : (\n <div className=\"p-4 text-center\">\n <Trans>No project selected</Trans>\n </div>\n )}\n </div>\n </>\n )\n}\n"],"mappings":";;;;AA0BA,IAAaE,KAA4BC,GAAkCC,MAAAA;CACzE,IAAM,EAAEC,aAAUC,cAAWC,gBAAaC,qBAAkBJ,GAEtDK,IAAeR,EAAgBE,CAAAA;CAGrC,IAAI,CAACM,EAAa,iBAChB,MAAMT,EAAS;EACbU,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,CAAA;CAIF,IAAMK,IAAWC,EAAQH,EAAa,gBAAgB,OAQhDM,IAPUH,EAAQH,EAAa,gBAAgB,QAOjBK,IAC9BE,IAAmBL,IAAW,UAAUI,IAAmB,SAAS,MACpEE,IAAsBN,IAAW,eAAeI,IAAmB,YAAY;CAErF,IAAIV,MAAa,WAAWA,MAAa,QAOvC,MALQL,EADJ,CAACgB,KAAoB,CAACC,IACT;EACbP,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,IAEa;EACbI,IAAI;EACJN,QAAQ;GAAEE;GAAWD,UAAUW;GAAkBT,aAAaU;GAAqBT;EAAc;CACnG,CALE;CAQJ,IAAIH,MAAa,WAAW,CAACM,GAQ3B,MAAMX,EAPDe,IAOU;EACbL,IAAI;EACJN,QAAQ;GAAEE;GAAWD,UAAU;GAAQE,aAAa;GAAWC;EAAc;CAC/E,IATiB;EACbE,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,CAAA;CASJ,IAAID,MAAa,UAAU,CAACU,GAQ1B,MAAMf,EAPDW,IAOU;EACbD,IAAI;EACJN,QAAQ;GAAEE;GAAWD,UAAU;GAASE,aAAa;GAAcC;EAAc;CACnF,IATiB;EACbE,IAAI;EACJN,QAAQ,EAAEE,aAAU;CACtB,CAAA;CAcJ,IAAID,MAAa,WAAWA,MAAa,QAAQ;EAC/C,IAAMa,IAAsBb,MAAa,UAAU,eAAe;EAClE,IAAIE,MAAgBW,GAClB,MAAMlB,EAAS;GACbU,IAAI;GACJN,QAAQ;IAAEE;IAAWD;IAAUE,aAAaW;IAAqBV;GAAc;EACjF,CAAA;CAEJ;AACF,2FC5FMc,IAAsBD,EAAEE,OAAO;CACnCC,QAAQH,EAAEI,OAAM,EAAGC,SAAQ;CAC3BC,QAAQN,EAAEO,KAAK;EAAC;EAAQ;EAAiB;EAAS;EAAgB;EAAO,EAAEF,SAAQ,EAAGG,QAAQ,MAAA;CAC9FC,eAAeT,EAAEO,KAAK,CAAC,OAAO,MAAA,CAAO,EAAEF,SAAQ,EAAGG,QAAQ,KAAA;CAC1DE,QAAQV,EAAEI,OAAM,EAAGC,SAAQ;CAC3BM,KAAKX,EAAEO,KAAK,CAAC,OAAO,SAAA,CAAU,EAAEF,SAAQ,EAAGG,QAAQ,KAAA;AACrD,CAAA,GAEaI,IAAQd,EACnB,mFAAA,EACA;CACAe,YAAY;EACVC,SAAS;EACTC,SAAS;EACTC,WAAW,EACTC,MAAM,6BACR;EACAC,UAAU;EACVC,cAAc,EAAEC,UAAU,UAAU;EACpCC,OAAO;GAAEC,iBAAiB;GAAYC,IAAI;EAAsD;CAClG;CACAE,gBAAgBxB;CAChByB,OAAO,EAAEC,gBAAa,EACpBC,MAAM,CAAC,EAAEC,OAAOF,EAAMG,OAAOC,cAAc,CAAA,EAC7C;CACAC,WAASC,EAAAC,GAAA,WAAA;CAGTC,mBAAiBF,EAAAG,GAAA,mBAAA;CAOjBC,QAAQ,OAAO,EAAEC,iBAAS;EACxB,IAAM,EAAEC,kBAAeD;EAGvB,OAAO;GACLM,QAAQL;GACRC,mBAAAA,MAJ8BD,GAAYE,KAAKC,qBAAqBC,MAAAA;EAKtE;CACF;CACAE,YAAY,OAAO,EAAEP,YAASR,gBAAQ;EACpC,IAAM,EAAES,kBAAeD;EAEvBvC,EAAyByC,MADOD,GAAYE,KAAKC,qBAAqBC,MAAAA,GACzBb,CAAAA;CAC/C;AACF,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"objects-o2Cj_ndZ.mjs","names":["Trans","Route","SplitNotFoundComponent","notFoundComponent"],"sources":["../../src/client/routes/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/index.tsx?tsr-split=notFoundComponent"],"sourcesContent":["import { createFileRoute, useParams } from \"@tanstack/react-router\"\nimport { checkServiceAvailability } from \"../../../../-components/utils/serviceAvailability\"\nimport { ErrorBoundary } from \"react-error-boundary\"\nimport { Trans } from \"@lingui/react/macro\"\nimport { SwiftObjects } from \"../../../../-components/Swift/Objects\"\nimport { CephObjects } from \"../../../../-components/Ceph/Objects\"\nimport { z } from \"zod\"\nimport type { RouteInfo } from \"@/client/routes/routeInfo\"\nimport { BucketHeader } from \"../../../../-components/Ceph/Buckets/BucketHeader\"\n\n// Search params schema\n// - prefix: base64-encoded current folder path, safe to carry \"/\" chars in the URL\n// - sortBy: active sort column key — persisted so deep links and back navigation restore sort state\n// Accepts both Swift keys (last_modified, bytes) and Ceph keys (lastModified, size) for compatibility\n// - sortDirection: \"asc\" | \"desc\" — persisted alongside sortBy\nconst objectsSearchSchema = z.object({\n prefix: z.string().optional(),\n sortBy: z.enum([\"name\", \"last_modified\", \"bytes\", \"lastModified\", \"size\"]).optional(),\n sortDirection: z.enum([\"asc\", \"desc\"]).optional(),\n search: z.string().optional(),\n tab: z.enum([\"all\", \"deleted\"]).optional().default(\"all\"),\n})\n\nexport const Route = createFileRoute(\n \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\"\n)({\n staticData: {\n section: \"storage\",\n service: \"containers\",\n analytics: {\n name: \"storage.objectstore.detail\",\n },\n isDetail: true,\n sectionCrumb: { labelKey: \"Storage\" },\n crumb: { useParamAsLabel: \"provider\", to: \"/projects/$projectId/storage/$provider/$storageType\" },\n } satisfies RouteInfo,\n validateSearch: objectsSearchSchema,\n head: ({ match }) => ({\n meta: [{ title: match.params.containerName }],\n }),\n component: () => {\n return <ObjectsDashboard />\n },\n notFoundComponent: () => {\n return (\n <p>\n <Trans>Storage container not found</Trans>\n </p>\n )\n },\n loader: async ({ context }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n\n return {\n client: trpcClient,\n availableServices,\n }\n },\n beforeLoad: async ({ context, params }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n checkServiceAvailability(availableServices!, params)\n },\n})\n\nfunction ObjectsDashboard() {\n const { projectId, provider, containerName } = useParams({\n from: \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\",\n select: (params) => ({\n projectId: params.projectId,\n provider: params.provider,\n containerName: params.containerName,\n }),\n })\n\n const { prefix, sortBy, sortDirection, search } = Route.useSearch()\n\n // For Ceph buckets, we show ContentHeader with badges and actions\n // For Swift containers, the component handles its own header\n const showContentHeader = provider === \"ceph\"\n\n return (\n <>\n {showContentHeader && <BucketHeader bucketName={containerName} />}\n <div>\n {projectId ? (\n <ErrorBoundary\n resetKeys={[projectId, provider, containerName, prefix, sortBy, sortDirection, search]}\n fallback={\n <div className=\"p-4 text-center\">\n <Trans>Error loading component</Trans>\n </div>\n }\n >\n {(() => {\n switch (provider) {\n case \"swift\":\n return <SwiftObjects provider={provider} containerName={containerName} />\n case \"ceph\":\n return <CephObjects bucketName={containerName} />\n default:\n return (\n <div className=\"p-4\">\n <Trans>Objects: {containerName}</Trans>\n </div>\n )\n }\n })()}\n </ErrorBoundary>\n ) : (\n <div className=\"p-4 text-center\">\n <Trans>No project selected</Trans>\n </div>\n )}\n </div>\n </>\n )\n}\n"],"mappings":";;;AAcA,IAAAE,UA+BM,gBAAC,KAAA,EAAA,UACC,gBAAA,GAAA,EAAA,IAAA,SAAA,CAAA,EAAA,CAAA"}
1
+ {"version":3,"file":"objects-o2Cj_ndZ.mjs","names":["Trans","Route","SplitNotFoundComponent","notFoundComponent"],"sources":["../../src/client/routes/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/index.tsx?tsr-split=notFoundComponent"],"sourcesContent":["import { createFileRoute, useParams } from \"@tanstack/react-router\"\nimport { checkServiceAvailability } from \"../../../../-components/utils/serviceAvailability\"\nimport { ErrorBoundary } from \"react-error-boundary\"\nimport { Trans } from \"@lingui/react/macro\"\nimport { SwiftObjects } from \"../../../../-components/Swift/Objects\"\nimport { CephObjects } from \"../../../../-components/Ceph/Objects\"\nimport { z } from \"zod\"\nimport type { RouteInfo } from \"@/client/routes/routeInfo\"\nimport { BucketHeader } from \"../../../../-components/Ceph/Buckets/BucketHeader\"\n\n// Search params schema\n// - prefix: base64-encoded current folder path, safe to carry \"/\" chars in the URL\n// - sortBy: active sort column key — persisted so deep links and back navigation restore sort state\n// Accepts both Swift keys (last_modified, bytes) and Ceph keys (lastModified, size) for compatibility\n// - sortDirection: \"asc\" | \"desc\" — persisted alongside sortBy\nconst objectsSearchSchema = z.object({\n prefix: z.string().optional(),\n sortBy: z.enum([\"name\", \"last_modified\", \"bytes\", \"lastModified\", \"size\"]).optional().default(\"name\"),\n sortDirection: z.enum([\"asc\", \"desc\"]).optional().default(\"asc\"),\n search: z.string().optional(),\n tab: z.enum([\"all\", \"deleted\"]).optional().default(\"all\"),\n})\n\nexport const Route = createFileRoute(\n \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\"\n)({\n staticData: {\n section: \"storage\",\n service: \"containers\",\n analytics: {\n name: \"storage.objectstore.detail\",\n },\n isDetail: true,\n sectionCrumb: { labelKey: \"Storage\" },\n crumb: { useParamAsLabel: \"provider\", to: \"/projects/$projectId/storage/$provider/$storageType\" },\n } satisfies RouteInfo,\n validateSearch: objectsSearchSchema,\n head: ({ match }) => ({\n meta: [{ title: match.params.containerName }],\n }),\n component: () => {\n return <ObjectsDashboard />\n },\n notFoundComponent: () => {\n return (\n <p>\n <Trans>Storage container not found</Trans>\n </p>\n )\n },\n loader: async ({ context }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n\n return {\n client: trpcClient,\n availableServices,\n }\n },\n beforeLoad: async ({ context, params }) => {\n const { trpcClient } = context\n const availableServices = await trpcClient?.auth.getAvailableServices.query()\n checkServiceAvailability(availableServices!, params)\n },\n})\n\nfunction ObjectsDashboard() {\n const { projectId, provider, containerName } = useParams({\n from: \"/_auth/projects/$projectId/storage/$provider/$storageType/$containerName/objects/\",\n select: (params) => ({\n projectId: params.projectId,\n provider: params.provider,\n containerName: params.containerName,\n }),\n })\n\n const { prefix, sortBy, sortDirection, search } = Route.useSearch()\n\n // For Ceph buckets, we show ContentHeader with badges and actions\n // For Swift containers, the component handles its own header\n const showContentHeader = provider === \"ceph\"\n\n return (\n <>\n {showContentHeader && <BucketHeader bucketName={containerName} />}\n <div>\n {projectId ? (\n <ErrorBoundary\n resetKeys={[projectId, provider, containerName, prefix, sortBy, sortDirection, search]}\n fallback={\n <div className=\"p-4 text-center\">\n <Trans>Error loading component</Trans>\n </div>\n }\n >\n {(() => {\n switch (provider) {\n case \"swift\":\n return <SwiftObjects provider={provider} containerName={containerName} />\n case \"ceph\":\n return <CephObjects bucketName={containerName} />\n default:\n return (\n <div className=\"p-4\">\n <Trans>Objects: {containerName}</Trans>\n </div>\n )\n }\n })()}\n </ErrorBoundary>\n ) : (\n <div className=\"p-4 text-center\">\n <Trans>No project selected</Trans>\n </div>\n )}\n </div>\n </>\n )\n}\n"],"mappings":";;;AAcA,IAAAE,UA+BM,gBAAC,KAAA,EAAA,UACC,gBAAA,GAAA,EAAA,IAAA,SAAA,CAAA,EAAA,CAAA"}
@@ -35269,10 +35269,11 @@ var versioningRouter = {
35269
35269
  }
35270
35270
  }),
35271
35271
  /**
35272
- * Check if folders contain deleted files (files with delete markers).
35272
+ * Check if folders contain deleted files (files with delete markers) or if the folder marker itself is deleted.
35273
35273
  *
35274
- * For each folder, performs a query without delimiter to check all nested objects.
35275
- * Returns whether each folder contains at least one file with a delete marker as latest version.
35274
+ * For each folder, checks:
35275
+ * 1. If the folder marker itself (key ending in "/") has a delete marker
35276
+ * 2. If any nested objects have delete markers
35276
35277
  *
35277
35278
  * Note: This can be expensive for many folders (N S3 requests for N folders).
35278
35279
  * Use sparingly and consider caching.
@@ -35290,6 +35291,7 @@ var versioningRouter = {
35290
35291
  const results = await Promise.all(input.folders.map(async (folderPrefix) => {
35291
35292
  try {
35292
35293
  let hasDeleteMarkers = false;
35294
+ let isFolderMarkerDeleted = false;
35293
35295
  let keyMarker;
35294
35296
  let versionIdMarker;
35295
35297
  while (!hasDeleteMarkers) {
@@ -35300,6 +35302,15 @@ var versioningRouter = {
35300
35302
  KeyMarker: keyMarker,
35301
35303
  VersionIdMarker: versionIdMarker
35302
35304
  }));
35305
+ if (!isFolderMarkerDeleted && response.DeleteMarkers) {
35306
+ const folderMarkerDeleteMarkers = response.DeleteMarkers.filter((dm) => dm.Key === folderPrefix);
35307
+ if (folderMarkerDeleteMarkers.length > 0) {
35308
+ const latestFolderMarker = folderMarkerDeleteMarkers.find((dm) => dm.IsLatest);
35309
+ if (latestFolderMarker) {
35310
+ isFolderMarkerDeleted = true;
35311
+ }
35312
+ }
35313
+ }
35303
35314
  hasDeleteMarkers = (response.DeleteMarkers?.length ?? 0) > 0;
35304
35315
  if (!response.IsTruncated || hasDeleteMarkers) {
35305
35316
  break;
@@ -35309,13 +35320,15 @@ var versioningRouter = {
35309
35320
  }
35310
35321
  return {
35311
35322
  prefix: folderPrefix,
35312
- hasDeletedContent: hasDeleteMarkers
35323
+ hasDeletedContent: hasDeleteMarkers,
35324
+ isFolderDeleted: isFolderMarkerDeleted
35313
35325
  };
35314
35326
  } catch (error) {
35315
35327
  console.error(`Failed to check deleted content for folder ${folderPrefix}:`, error);
35316
35328
  return {
35317
35329
  prefix: folderPrefix,
35318
- hasDeletedContent: false
35330
+ hasDeletedContent: false,
35331
+ isFolderDeleted: false
35319
35332
  };
35320
35333
  }
35321
35334
  }));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cobaltcore-dev/aurora",
3
- "version": "0.14.1",
3
+ "version": "0.16.0",
4
4
  "private": false,
5
5
  "description": "Aurora OpenStack dashboard — server and client library",
6
6
  "license": "Apache-2.0",
@@ -60,7 +60,6 @@
60
60
  "@trpc/server": "11.16.0",
61
61
  "class-variance-authority": "^0.7.1",
62
62
  "clsx": "^2.1.1",
63
- "d3": "^7.9.0",
64
63
  "fastify-plugin": "^5.1.0",
65
64
  "focus-trap-react": "^12.0.0",
66
65
  "node-fetch": "^3.3.2",
@@ -82,7 +81,6 @@
82
81
  "@testing-library/jest-dom": "^6.6.3",
83
82
  "@testing-library/react": "^16.3.0",
84
83
  "@testing-library/user-event": "^14.6.1",
85
- "@types/d3": "^7.4.3",
86
84
  "@types/node": "^24.0.0",
87
85
  "@types/react": "^19.1.5",
88
86
  "@types/react-dom": "^19.1.5",