Merge 23.0 into dev

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galaxyproject/galaxy-client",
-  "version": "0.1.0",
+  "version": "23.0.0",
   "description": "Galaxy client application build system",
   "keywords": [
     "galaxy"

client/src/components/ClientError.vue

@@ -6,7 +6,6 @@
 // (AdminRequired), but could be used for other client errors that need to be
 // presented to the user interrupting the normal flow and context of the app.
 
-import { defineProps } from "vue";
 import Alert from "@/components/Alert.vue";
 
 const props = defineProps<{

client/src/components/providers/UserHistories.js

@@ -28,7 +28,9 @@ export default {
             return null;
         },
         historyModels() {
-            return this.histories.map((h) => Object.assign({}, h));
+            return this.histories
+                .map((h) => Object.assign({}, h))
+                .filter((h) => !h.user_id || h.user_id === this.user.id);
         },
     },
     methods: {

client/src/composables/toast.ts

@@ -30,7 +30,7 @@ export const Toast = {
     },
 
     error(message: string, title = "Error") {
-        toastRef.value?.showToast(message, title, "error");
+        toastRef.value?.showToast(message, title, "danger");
     },
 };
 

client/src/entry/analysis/router.js

@@ -504,18 +504,41 @@ export function getRouter(Galaxy) {
         ],
     });
 
-    router.beforeEach(async (to, from, next) => {
-        // TODO: merge anon redirect functionality here for more standard handling
-
+    function checkAdminAccessRequired(to) {
         // Check parent route hierarchy to see if we require admin access here.
         // Access is required if *any* component in the hierarchy requires it.
         if (to.matched.some((record) => record.meta.requiresAdmin === true)) {
-            const isAdmin = getGalaxyInstance()?.user?.isAdmin() || false;
-            if (!isAdmin) {
-                const error = new Error(`Administrator Access Required for '${to.path}'.`);
-                error.name = "AdminRequired";
-                next(error);
-            }
+            const isAdmin = getGalaxyInstance()?.user?.isAdmin();
+            return !isAdmin;
+        }
+        return false;
+    }
+
+    function checkRegisteredUserAccessRequired(to) {
+        // Check parent route hierarchy to see if we require registered user access here.
+        // Access is required if *any* component in the hierarchy requires it.
+        if (to.matched.some((record) => record.meta.requiresRegisteredUser === true)) {
+            const isAnonymous = getGalaxyInstance()?.user?.isAnonymous();
+            return isAnonymous;
+        }
+        return false;
+    }
+
+    router.beforeEach(async (to, from, next) => {
+        // TODO: merge anon redirect functionality here for more standard handling
+
+        const isAdminAccessRequired = checkAdminAccessRequired(to);
+        if (isAdminAccessRequired) {
+            const error = new Error(`Admin access required for '${to.path}'.`);
+            error.name = "AdminRequired";
+            next(error);
+        }
+
+        const isRegisteredUserAccessRequired = checkRegisteredUserAccessRequired(to);
+        if (isRegisteredUserAccessRequired) {
+            const error = new Error(`Registered user access required for '${to.path}'.`);
+            error.name = "RegisteredUserRequired";
+            next(error);
         }
         next();
     });

client/src/entry/analysis/routes/storageDashboardRoutes.ts

@@ -6,6 +6,7 @@ export default [
     {
         path: "/storage",
         component: Base,
+        meta: { requiresRegisteredUser: true },
         children: [
             {
                 path: "",

client/src/store/historyStore/historyStore.js

@@ -16,7 +16,7 @@ import {
 const state = {
     // selected history
     currentHistoryId: null,
-    // histories for current user
+    // histories for current user, can also have other user histories loaded for HistoryView
     histories: {},
     historiesLoading: false,
 };
@@ -98,7 +98,7 @@ let isLoadingHistories = false;
 const actions = {
     async copyHistory({ dispatch }, { history, name, copyAll }) {
         const newHistory = await cloneHistory(history, name, copyAll);
-        return dispatch("selectHistory", newHistory);
+        return dispatch("setCurrentHistory", newHistory.id);
     },
     async createNewHistory({ dispatch }) {
         // create history, then select it as current at the same time

doc/source/admin/galaxy_options.rst

@@ -2915,6 +2915,18 @@
 :Type: float
 
 
+~~~~~~~~~~~~~~~~~~~
+``sentry_ca_certs``
+~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Use this option to provide the path to location of the CA
+    (Certificate Authority) certificate file if the sentry server uses
+    a self-signed certificate.
+:Default: ``None``
+:Type: str
+
+
 ~~~~~~~~~~~~~~~
 ``statsd_host``
 ~~~~~~~~~~~~~~~