Merge branch 'dev' of github.com:galaxyproject/galaxy into add-onedat…

…a-templates

# Conflicts:
#	lib/galaxy/dependencies/dev-requirements.txt

.github/labeler.yml

@@ -109,12 +109,13 @@ area/toolshed:
       - lib/toolshed/**/*
       - templates/webapps/tool_shed/**/*
 area/UI-UX:
-  - changed-files:
-    - any-glob-to-any-file:
-      - client/src/**/*
-      - templates/**/*
-    - all-globs-to-all-files:
-      - '!client/src/api/schema/schema.ts'
+  - all:
+    - changed-files:
+      - any-glob-to-any-file:
+        - client/src/**/*
+        - templates/**/*
+      - all-globs-to-all-files:
+        - '!client/src/api/schema/schema.ts'
 area/util:
   - changed-files:
     - any-glob-to-any-file:

.github/workflows/lint_openapi_schema.yml

@@ -28,6 +28,11 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18.12.1'
+          cache: 'yarn'
+          cache-dependency-path: 'galaxy root/client/yarn.lock'
       - name: Get full Python version
         id: full-python-version
         shell: bash

.github/workflows/maintenance_bot.yaml

@@ -8,6 +8,7 @@ jobs:
     if: github.repository_owner == 'galaxyproject'
     permissions:
       contents: read
+      issues: write
       pull-requests: write
     runs-on: ubuntu-latest
     env:

SECURITY.md

@@ -16,8 +16,7 @@ The following branches or releases receive security support:
 
 - Development on the `dev` branch, hosted on GitHub, which will become the next release of Galaxy
 - Releases within the past 12 months.
-  - E.g. 16.04 will receive support until 2017-04. As the month changes to 2017-05 it will become unsupported.
-- There are currently no plans for Long Term Support (LTS) releases.
+  - E.g. 24.0 will receive support for a full year, at which point 25.0 will be available.
 
 For unsupported branches:
 

client/package.json

@@ -81,7 +81,7 @@
     "markdown-it": "^13.0.2",
     "markdown-it-regexp": "^0.4.0",
     "object-hash": "^3.0.0",
-    "openapi-typescript": "^6.1.0",
+    "openapi-typescript": "^6.7.6",
     "openapi-typescript-fetch": "^1.1.3",
     "pinia": "^2.1.7",
     "popper.js": "^1.16.1",

client/src/api/configTemplates.ts

@@ -10,7 +10,7 @@ export type TemplateVariable =
     | components["schemas"]["TemplateVariablePathComponent"]
     | components["schemas"]["TemplateVariableBoolean"];
 export type TemplateSecret = components["schemas"]["TemplateSecret"];
-export type VariableValueType = (string | boolean | number) | undefined;
+export type VariableValueType = string | boolean | number;
 export type VariableData = { [key: string]: VariableValueType };
 export type SecretData = { [key: string]: string };
 

client/src/api/datasetCollections.ts

@@ -72,7 +72,6 @@ export const fetchCollectionAttributes = fetcher
     .create();
 
 const postCopyCollection = fetcher.path("/api/dataset_collections/{id}/copy").method("post").create();
-export async function copyCollection(id: string, dbkey: string): Promise<Record<string, never>> {
-    const { data } = await postCopyCollection({ id, dbkey });
-    return data;
+export async function copyCollection(id: string, dbkey: string): Promise<void> {
+    await postCopyCollection({ id, dbkey });
 }

client/src/api/index.test.ts

@@ -22,6 +22,7 @@ const REGISTERED_USER: User = {
 
 const ANONYMOUS_USER: AnonymousUser = {
     isAnonymous: true,
+    total_disk_usage: 0,
 };
 
 const SESSIONLESS_USER = null;

client/src/api/index.ts

@@ -227,7 +227,7 @@ export interface User extends QuotaUsageResponse {
     username?: string;
 }
 
-export interface AnonymousUser {
+export interface AnonymousUser extends QuotaUsageResponse {
     id?: string;
     isAnonymous: true;
     is_admin?: false;