New UI components for the S3 explorer with Codex

.vscode/mcp.json

@@ -0,0 +1,9 @@
+{
+	"servers": {
+		"figma": {
+			"url": "http://127.0.0.1:3845/mcp",
+			"type": "http"
+		}
+	},
+	"inputs": []
+}

helm-chart/Chart.yaml

@@ -14,4 +14,4 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 10.30.13
+version: 10.32.0

helm-chart/README.md

@@ -22,7 +22,7 @@ ingress:
     - host: datalab.my-domain.net
 EOF
 
-helm install onyxia onyxia/onyxia --version "10.30.13" -f onyxia-values.yaml
+helm install onyxia onyxia/onyxia --version "10.32.0" -f onyxia-values.yaml
 ```
 
 ### Using the Keycloak Theme (Optional)
@@ -44,7 +44,7 @@ extraInitContainers: |
     args:
       - -c
       - |
-        curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v10.30.13/keycloak-theme.jar
+        curl -L -f -S -o /extensions/onyxia.jar https://github.com/InseeFrLab/onyxia/releases/download/v10.32.0/keycloak-theme.jar
     volumeMounts:
       - name: extensions
         mountPath: /extensions
@@ -71,7 +71,7 @@ After that, you should be able to select *onyxia* as *Login Theme*.
 Documentation reference for the available configuration parameter of the Onyxia Helm Chart.
 
 -   [The REST API (`api`)](https://github.com/InseeFrLab/onyxia-api/blob/v4.11.0/README.md#configuration)
--   [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v4.56.19/web/.env)
+-   [The Web Application (`web`)](https://github.com/InseeFrLab/onyxia/blob/web-v4.58.0/web/.env)
 
 Below is a sample `onyxia-values.yaml` file that illustrates where to specify the `api` and `web` configuration parameters.
 
@@ -107,4 +107,4 @@ Below is a sample `onyxia-values.yaml` file that illustrates where to specify th
 If you are building your own service catalog for Onyxia ([learn how](https://docs.onyxia.sh/catalog-of-services)).  
 Here are defined the onyxia reserved parameter and the structure of the dynamic context:
 
-[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v4.56.19/web/src/core/ports/OnyxiaApi/XOnyxia.ts)
+[`values.schema.json` `"x-onyxia"` specifications](https://github.com/InseeFrLab/onyxia/blob/web-v4.58.0/web/src/core/ports/OnyxiaApi/XOnyxia.ts)

helm-chart/templates/web/deployment.yaml

@@ -41,6 +41,10 @@ spec:
               value: {{ $value | quote }}
             {{- end -}}
             {{- end }}
+          {{- if .Values.onboarding.enabled }}
+            - name: OIDC_DISABLE_DPOP
+              value: "true"
+          {{- end }}
           ports:
             - name: http
               containerPort: {{ .Values.web.containerPort }}

helm-chart/values.yaml

@@ -30,7 +30,7 @@ web:
   replicaCount: 1
   image:
     repository: inseefrlab/onyxia-web
-    tag: 4.56.19
+    tag: 4.58.0
     pullPolicy: IfNotPresent
 
   ## Pod priority settings

web/.env

@@ -887,3 +887,6 @@ ONYXIA_VERSION_URL=
 SCREEN_SCALER=true
 
 OIDC_DEBUG_LOGS=false
+
+# NOTE: Temporary workaround until the Go onboarding API supports it.
+OIDC_DISABLE_DPOP=false

web/package.json

@@ -2,7 +2,7 @@
     "name": "onyxia-web",
     "homepage": "https://onyxia.sh",
     "type": "module",
-    "version": "4.56.19",
+    "version": "4.58.0",
     "license": "MIT",
     "scripts": {
         "postinstall": "yarn install-git-hooks && yarn postinstall:code-gen",
@@ -69,7 +69,7 @@
         "memoizee": "^0.4.17",
         "minimal-polyfills": "^2.2.3",
         "mui-icons-material-lazy": "^1.0.4",
-        "oidc-spa": "^8.6.3",
+        "oidc-spa": "10.0.1-rc.6",
         "onyxia-ui": "^6.7.8",
         "pathe": "^2.0.3",
         "powerhooks": "^2.0.1",

web/src/core/adapters/oidc/mock.ts

@@ -1,5 +1,5 @@
 import type { Oidc } from "core/ports/Oidc";
-import { createMockOidc } from "oidc-spa/mock";
+import { createMockOidc } from "oidc-spa/core-mock";
 
 export async function createOidc(params: {
     isUserInitiallyLoggedIn: boolean;
@@ -8,7 +8,6 @@ export async function createOidc(params: {
 
     const oidc = await createMockOidc({
         isUserInitiallyLoggedIn,
-        homeUrl: import.meta.env.BASE_URL,
         mockedTokens: {
             decodedIdToken: {}
         }

web/src/core/adapters/oidc/oidc.ts

@@ -1,5 +1,5 @@
 import type { Oidc } from "core/ports/Oidc";
-import { createOidc as createOidcSpa } from "oidc-spa";
+import { createOidc as createOidcSpa } from "oidc-spa/core";
 import { isKeycloak } from "oidc-spa/keycloak";
 import type { OidcParams, OidcParams_Partial } from "core/ports/OnyxiaApi";
 import { objectKeys } from "tsafe/objectKeys";

web/src/core/adapters/sqlOlap/sqlOlap.ts

@@ -173,8 +173,8 @@ export const createDuckDbSqlOlap = (params: {
 
                     await conn.query(
                         [
-                            "LOAD httpfs;",
-                            `SET custom_extension_repository = '${window.location.origin}${import.meta.env.BASE_URL}duckdb-extensions';`
+                            `SET custom_extension_repository = '${window.location.origin}${import.meta.env.BASE_URL}duckdb-extensions';`,
+                            "LOAD httpfs;"
                         ].join("\n")
                     );
 
@@ -278,7 +278,7 @@ export const createDuckDbSqlOlap = (params: {
                 sourceUrl = sourceUrl_noRedirect;
             }
 
-            const sqlQuery = `SELECT * FROM ${(() => {
+            let sqlQuery = `SELECT * FROM ${(() => {
                 switch (fileType) {
                     case "csv":
                         return `read_csv('${sourceUrl}')`;
@@ -287,7 +287,11 @@ export const createDuckDbSqlOlap = (params: {
                     case "json":
                         return `read_json('${sourceUrl}')`;
                 }
-            })()} LIMIT ${rowsPerPage} OFFSET ${rowsPerPage * (page - 1)}`;
+            })()} LIMIT ${rowsPerPage}`;
+
+            if (page !== 1) {
+                sqlQuery += ` OFFSET ${rowsPerPage * (page - 1)}`;
+            }
 
             const conn = await db.connect();
             const stmt = await conn.prepare(sqlQuery);

web/src/core/ports/Oidc.ts

@@ -2,10 +2,9 @@ export declare type Oidc = Oidc.LoggedIn | Oidc.NotLoggedIn;
 
 export declare namespace Oidc {
     export type Common = {
-        params: {
-            issuerUri: string;
-            clientId: string;
-        };
+        issuerUri: string;
+        clientId: string;
+        validRedirectUri: string;
     };
 
     export type NotLoggedIn = Common & {

web/src/core/tools/S3Uri.ts

@@ -0,0 +1,232 @@
+import { assert, type Equals, id } from "tsafe";
+import { same } from "evt/tools/inDepth/same";
+import { z } from "zod";
+
+export type S3Uri = S3Uri.Object | S3Uri.Prefix;
+
+export namespace S3Uri {
+    type Common = {
+        bucket: string;
+        delimiter: string;
+        keySegments: string[];
+    };
+
+    export type Object = Common & {
+        type: "object";
+        keyBasename: string;
+    };
+
+    export type Prefix = Prefix.TerminatedByDelimiter | Prefix.NonTerminatedByDelimiter;
+
+    export namespace Prefix {
+        type Common_Prefix = Common & {
+            type: "prefix";
+        };
+
+        export type TerminatedByDelimiter = Common_Prefix & {
+            isDelimiterTerminated: true;
+        };
+
+        export type NonTerminatedByDelimiter = Common_Prefix & {
+            isDelimiterTerminated: false;
+            nextKeySegmentPrefix: string;
+        };
+    }
+}
+
+export function stringifyS3Uri(s3Uri: S3Uri): string {
+    let s3UriStr = [
+        "s3://",
+        `${s3Uri.bucket}/`,
+        s3Uri.keySegments.map(keySegment => `${keySegment}${s3Uri.delimiter}`).join("")
+    ].join("");
+
+    switch (s3Uri.type) {
+        case "object":
+            s3UriStr += s3Uri.keyBasename;
+            break;
+        case "prefix":
+            if (!s3Uri.isDelimiterTerminated) {
+                s3UriStr += s3Uri.nextKeySegmentPrefix;
+            }
+            break;
+        default:
+            assert<Equals<typeof s3Uri, never>>;
+    }
+
+    return s3UriStr;
+}
+
+export function getS3UriKeyOrKeyPrefix(s3Uri: S3Uri): string {
+    return stringifyS3Uri(s3Uri).slice(`s3://${s3Uri.bucket}/`.length);
+}
+
+export function parseS3Uri(params: {
+    value: string;
+    delimiter: string;
+    isPrefix: false;
+}): S3Uri.Object;
+export function parseS3Uri(params: {
+    value: string;
+    delimiter: string;
+    isPrefix: true;
+}): S3Uri.Prefix;
+export function parseS3Uri(params: {
+    value: string;
+    delimiter: string;
+    isPrefix: boolean;
+}): S3Uri {
+    const { value, delimiter, isPrefix } = params;
+
+    const match = value.match(/^s3:\/\/([^/]+)(\/?.*)$/);
+
+    if (match === null) {
+        throw new Error(`Malformed S3 URI: ${value}`);
+    }
+
+    const bucket = match[1];
+
+    const group2 = match[2];
+
+    if (group2 === "" || group2 === "/") {
+        return id<S3Uri.Prefix.TerminatedByDelimiter>({
+            type: "prefix",
+            bucket,
+            delimiter,
+            keySegments: [],
+            isDelimiterTerminated: true
+        });
+    }
+
+    const key = group2.slice(1);
+
+    const [last, ...rest_reversed] = key.split(delimiter).reverse();
+
+    const keySegments = rest_reversed.reverse();
+
+    if (last === "") {
+        assert(isPrefix);
+        return id<S3Uri.Prefix.TerminatedByDelimiter>({
+            type: "prefix",
+            bucket,
+            delimiter,
+            keySegments,
+            isDelimiterTerminated: true
+        });
+    }
+
+    if (isPrefix) {
+        return id<S3Uri.Prefix.NonTerminatedByDelimiter>({
+            type: "prefix",
+            bucket,
+            delimiter,
+            keySegments,
+            isDelimiterTerminated: false,
+            nextKeySegmentPrefix: last
+        });
+    }
+
+    return id<S3Uri.Object>({
+        type: "object",
+        bucket,
+        delimiter,
+        keySegments,
+        keyBasename: last
+    });
+}
+
+export function getIsInside(params: {
+    s3UriPrefix: S3Uri.Prefix;
+    s3Uri: S3Uri;
+}): { isInside: false; isTopLevel?: never } | { isInside: true; isTopLevel: boolean } {
+    const { s3UriPrefix, s3Uri } = params;
+
+    if (!stringifyS3Uri(s3Uri).startsWith(stringifyS3Uri(s3UriPrefix))) {
+        return { isInside: false };
+    }
+    return {
+        isInside: true,
+        isTopLevel: same(s3UriPrefix.keySegments, s3Uri.keySegments)
+    };
+}
+
+export const zS3UriObject = (() => {
+    type TargetType = S3Uri.Object;
+
+    const zTargetType = z.object({
+        type: z.literal("object"),
+        bucket: z.string(),
+        delimiter: z.string(),
+        keySegments: z.array(z.string()),
+        keyBasename: z.string()
+    });
+
+    type InferredType = z.infer<typeof zTargetType>;
+
+    assert<Equals<TargetType, InferredType>>;
+
+    return id<z.ZodType<TargetType>>(zTargetType);
+})();
+
+export const zS3UriPrefixDelimiterTerminated = (() => {
+    type TargetType = S3Uri.Prefix.TerminatedByDelimiter;
+
+    const zTargetType = z.object({
+        type: z.literal("prefix"),
+        bucket: z.string(),
+        delimiter: z.string(),
+        keySegments: z.array(z.string()),
+        isDelimiterTerminated: z.literal(true)
+    });
+
+    type InferredType = z.infer<typeof zTargetType>;
+
+    assert<Equals<TargetType, InferredType>>;
+
+    return id<z.ZodType<TargetType>>(zTargetType);
+})();
+
+export const zS3UriPrefixNonDelimiterTerminated = (() => {
+    type TargetType = S3Uri.Prefix.NonTerminatedByDelimiter;
+
+    const zTargetType = z.object({
+        type: z.literal("prefix"),
+        bucket: z.string(),
+        delimiter: z.string(),
+        keySegments: z.array(z.string()),
+        isDelimiterTerminated: z.literal(false),
+        nextKeySegmentPrefix: z.string()
+    });
+
+    type InferredType = z.infer<typeof zTargetType>;
+
+    assert<Equals<TargetType, InferredType>>;
+
+    return id<z.ZodType<TargetType>>(zTargetType);
+})();
+
+export const zS3UriPrefix = (() => {
+    type TargetType = S3Uri.Prefix;
+
+    const zTargetType = z.union([
+        zS3UriPrefixDelimiterTerminated,
+        zS3UriPrefixNonDelimiterTerminated
+    ]);
+
+    type InferredType = z.infer<typeof zTargetType>;
+
+    assert<Equals<TargetType, InferredType>>;
+    return id<z.ZodType<TargetType>>(zTargetType);
+})();
+
+export const zS3Uri = (() => {
+    type TargetType = S3Uri;
+
+    const zTargetType = z.union([zS3UriObject, zS3UriPrefix]);
+
+    type InferredType = z.infer<typeof zTargetType>;
+
+    assert<Equals<TargetType, InferredType>>;
+
+    return id<z.ZodType<TargetType>>(zTargetType);
+})();