Merge pull request #21264 from guerler/remove_js_app_mako

Move js-client bootstrapping to FastAPI

Author: guerler

client/src/api/client/index.ts

@@ -6,7 +6,7 @@ import { getAppRoot } from "@/onload/loadConfig";
 
 function getBaseUrl() {
     const isTest = process.env.NODE_ENV === "test";
-    return isTest ? window.location.origin : getAppRoot(undefined, true);
+    return isTest ? window.location.origin : getAppRoot().replace(/\/$/, "");
 }
 
 function apiClientFactory() {

client/src/api/schema/schema.ts

@@ -6477,6 +6477,23 @@ export interface paths {
         patch?: never;
         trace?: never;
     };
+    "/context": {
+        parameters: {
+            query?: never;
+            header?: never;
+            path?: never;
+            cookie?: never;
+        };
+        /** Return bootstrapped client context */
+        get: operations["index_context_get"];
+        put?: never;
+        post?: never;
+        delete?: never;
+        options?: never;
+        head?: never;
+        patch?: never;
+        trace?: never;
+    };
     "/ga4gh/drs/v1/objects/{object_id}": {
         parameters: {
             query?: never;
@@ -8213,6 +8230,19 @@ export interface components {
              */
             name: string;
         };
+        /** ContextResponse */
+        ContextResponse: {
+            /** Config */
+            config: {
+                [key: string]: unknown;
+            };
+            /** Session Csrf Token */
+            session_csrf_token?: string | null;
+            /** User */
+            user: {
+                [key: string]: unknown;
+            };
+        };
         /**
          * ConvertedDatasetsMap
          * @description Map of `file extension` -> `converted dataset encoded id`
@@ -45240,6 +45270,47 @@ export interface operations {
             };
         };
     };
+    index_context_get: {
+        parameters: {
+            query?: never;
+            header?: {
+                /** @description The user ID that will be used to effectively make this API call. Only admins and designated users can make API calls on behalf of other users. */
+                "run-as"?: string | null;
+            };
+            path?: never;
+            cookie?: never;
+        };
+        requestBody?: never;
+        responses: {
+            /** @description Successful Response */
+            200: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["ContextResponse"];
+                };
+            };
+            /** @description Request Error */
+            "4XX": {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["MessageExceptionModel"];
+                };
+            };
+            /** @description Server Error */
+            "5XX": {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    "application/json": components["schemas"]["MessageExceptionModel"];
+                };
+            };
+        };
+    };
     get_object_ga4gh_drs_v1_objects__object_id__get: {
         parameters: {
             query?: never;

…ent/src/onload/globalInits/initSentry.js client/src/app/addons/sentry.jsclient/src/onload/globalInits/initSentry.js renamed to client/src/app/addons/sentry.js client/src/onload/globalInits/initSentry.js renamed to client/src/app/addons/sentry.js

@@ -7,14 +7,15 @@ import Vue from "vue";
  *
  * @param {object} config Galaxy configuration object
  */
-export const initSentry = (galaxy, config) => {
+export async function initSentry(Galaxy, router) {
     console.log("initSentry");
-    if (config.sentry) {
-        const router = galaxy.router;
-        const { sentry_dsn_public, email } = config.sentry;
-        let release = galaxy.config.version_major;
-        if (galaxy.config.version_minor) {
-            release += `.${galaxy.config.version_minor}`;
+    const config = Galaxy.config;
+    if (config.sentry_dsn_public) {
+        const sentry_dsn_public = config.sentry_dsn_public;
+        const email = Galaxy.user.get("email");
+        let release = Galaxy.config.version_major;
+        if (Galaxy.config.version_minor) {
+            release += `.${Galaxy.config.version_minor}`;
         }
         Sentry.init({
             Vue,
@@ -37,6 +38,6 @@ export const initSentry = (galaxy, config) => {
                 });
             });
         }
-        galaxy.Sentry = Sentry;
+        Galaxy.Sentry = Sentry;
     }
-};
+}

…src/onload/globalInits/onloadWebhooks.js client/src/app/addons/webhooks.jsclient/src/onload/globalInits/onloadWebhooks.js renamed to client/src/app/addons/webhooks.js client/src/onload/globalInits/onloadWebhooks.js renamed to client/src/app/addons/webhooks.js

@@ -1,7 +1,7 @@
 import { appendScriptStyle } from "@/utils/utils";
 import { loadWebhooks } from "@/utils/webhooks";
 
-export async function onloadWebhooks(Galaxy) {
+export async function initWebhooks(Galaxy) {
     if (Galaxy.config.enable_webhooks) {
         const webhooks = await loadWebhooks("onload");
         webhooks.forEach((webhook) => {

client/src/app/app.test.js

@@ -3,49 +3,49 @@ import { suppressDebugConsole } from "@tests/vitest/helpers";
 import { beforeEach, describe, expect, test } from "vitest";
 
 import { getGalaxyInstance, setGalaxyInstance } from "@/app";
+import { GalaxyApp } from "@/app/galaxy";
 
 export function setupTestGalaxy(galaxyOptions_ = null) {
     galaxyOptions_ = galaxyOptions_ || galaxyOptions;
-    setGalaxyInstance((GalaxyApp) => new GalaxyApp(galaxyOptions_));
+    const app = new GalaxyApp(galaxyOptions_);
+    setGalaxyInstance(app);
 }
 
-// the app console debugs make sense but we just don't want to see them in test
-// output.
+// suppress console noise
 suppressDebugConsole();
 
-describe("App base construction/initializiation defaults", () => {
+describe("App base construction/initialization defaults", () => {
     beforeEach(() => {
         setupTestGalaxy(galaxyOptions);
     });
 
-    test("App base construction/initializiation defaults", function () {
+    test("App base construction/initialization defaults", () => {
         const app = getGalaxyInstance();
         expect(app.options && typeof app.options === "object").toBeTruthy();
         expect(app.config && typeof app.config === "object").toBeTruthy();
         expect(app.user && typeof app.config === "object").toBeTruthy();
         expect(app.localize).toBe(window._l);
     });
 
-    test("App base default options", function () {
+    test("App base default options", () => {
         const app = getGalaxyInstance();
         expect(app.options !== undefined && typeof app.options === "object").toBeTruthy();
         expect(app.options.root).toBe("/");
         expect(app.options.patchExisting).toBe(true);
     });
 
-    // // We no longer want this behavior, but leaving the test to express that
-    test("App base will patch in attributes from existing Galaxy objects", function () {
+    // we no longer patch attributes from existing Galaxy objects, test expresses that
+    test("App base will patch in attributes from existing Galaxy objects", () => {
         const existingApp = getGalaxyInstance();
         existingApp.foo = 123;
 
-        const newApp = setGalaxyInstance((GalaxyApp) => {
-            return new GalaxyApp();
-        });
+        const newApp = new GalaxyApp();
+        setGalaxyInstance(newApp);
 
-        expect(newApp.foo === 123).toBeTruthy();
+        expect(newApp.foo).toBeUndefined();
     });
 
-    test("App base config", function () {
+    test("App base config", () => {
         const app = getGalaxyInstance();
         expect(app.config && typeof app.config === "object").toBeTruthy();
         expect(app.config.allow_user_deletion).toBe(false);
@@ -54,9 +54,9 @@ describe("App base construction/initializiation defaults", () => {
         expect(app.config.ftp_upload_site).toBe(null);
     });
 
-    test("App base user", function () {
+    test("App base user", () => {
         const app = getGalaxyInstance();
         expect(app.user !== undefined && typeof app.user === "object").toBeTruthy();
-        expect(app.user.isAdmin() === false).toBeTruthy();
+        expect(app.user.isAdmin()).toBe(false);
     });
 });