Merge remote-tracking branch 'upstream/dev' into dev

.github/workflows/toolshed.yaml

@@ -61,7 +61,7 @@ jobs:
           path: 'galaxy root/.venv'
           key: gxy-venv-${{ runner.os }}-${{ steps.full-python-version.outputs.version }}-${{ hashFiles('galaxy root/requirements.txt') }}-toolshed
       - name: Install dependencies
-        run: ./scripts/common_startup.sh --skip-client-build
+        run: ./scripts/common_startup.sh --dev-wheels --skip-client-build
         working-directory: 'galaxy root'
       - name: Build Frontend
         run: |

client/gulpfile.js

@@ -120,6 +120,20 @@ function buildPlugins(callback, forceRebuild) {
             skipBuild = false;
         } else {
             if (fs.existsSync(hashFilePath)) {
+                const hashFileContent = fs.readFileSync(hashFilePath, "utf8").trim();
+                const isHash = /^[0-9a-f]{7,40}$/.test(hashFileContent); // Check for a 7 to 40 character hexadecimal string
+
+                if (!isHash) {
+                    console.log(`Hash file for ${pluginName} exists but does not have a valid git hash.`);
+                    skipBuild = false;
+                } else {
+                    skipBuild =
+                        child_process.spawnSync("git", ["diff", "--quiet", hashFileContent, "--", pluginDir], {
+                            stdio: "inherit",
+                            shell: true,
+                        }).status === 0;
+                }
+
                 skipBuild =
                     child_process.spawnSync("git", ["diff", "--quiet", `$(cat ${hashFilePath})`, "--", pluginDir], {
                         stdio: "inherit",

client/src/api/datasets.ts

@@ -1,7 +1,7 @@
 import type { FetchArgType } from "openapi-typescript-fetch";
 
 import { DatasetDetails } from "@/api";
-import { fetcher } from "@/api/schema";
+import { components, fetcher } from "@/api/schema";
 import { withPrefix } from "@/utils/redirect";
 
 export const datasetsFetcher = fetcher.path("/api/datasets").method("get").create();
@@ -87,3 +87,6 @@ export async function copyDataset(
 export function getCompositeDatasetLink(historyDatasetId: string, path: string) {
     return withPrefix(`/api/datasets/${historyDatasetId}/display?filename=${path}`);
 }
+
+export type DatasetExtraFiles = components["schemas"]["DatasetExtraFiles"];
+export const fetchDatasetExtraFiles = fetcher.path("/api/datasets/{dataset_id}/extra_files").method("get").create();

client/src/api/groups.ts

@@ -1,9 +1,13 @@
 import axios from "axios";
 
-import { components } from "@/api/schema";
+import { components, fetcher } from "@/api/schema";
 
 type GroupModel = components["schemas"]["GroupModel"];
 export async function getAllGroups(): Promise<GroupModel[]> {
     const { data } = await axios.get("/api/groups");
     return data;
 }
+
+export const deleteGroup = fetcher.path("/api/groups/{group_id}").method("delete").create();
+export const purgeGroup = fetcher.path("/api/groups/{group_id}/purge").method("post").create();
+export const undeleteGroup = fetcher.path("/api/groups/{group_id}/undelete").method("post").create();

client/src/api/jobs.ts

@@ -1,4 +1,8 @@
-import { fetcher } from "@/api/schema";
+import { components, fetcher } from "@/api/schema";
+
+export type JobDestinationParams = components["schemas"]["JobDestinationParams"];
 
 export const jobLockStatus = fetcher.path("/api/job_lock").method("get").create();
 export const jobLockUpdate = fetcher.path("/api/job_lock").method("put").create();
+
+export const fetchJobDestinationParams = fetcher.path("/api/jobs/{job_id}/destination_params").method("get").create();

client/src/api/roles.ts

@@ -5,3 +5,7 @@ export async function getAllRoles() {
     const { data } = await getRoles({});
     return data;
 }
+
+export const deleteRole = fetcher.path("/api/roles/{id}").method("delete").create();
+export const purgeRole = fetcher.path("/api/roles/{id}/purge").method("post").create();
+export const undeleteRole = fetcher.path("/api/roles/{id}/undelete").method("post").create();