Skip to content

Commit 74ce959

Browse files
mvdbeekmvdbeek
authored
Merge pull request #21128 from mvdbeek/merge_dev
Merge 25.1 into dev
2 parents a52d6ca + 3d20edc commit 74ce959

File tree

28 files changed

+1145
-51
lines changed

28 files changed

+1145
-51
lines changed

‎client-api/src/api-types.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export type DatasetStorageDetails = components["schemas"]["DatasetStorageDetails
2626
export type DatasetCollectionAttributes = components["schemas"]["DatasetCollectionAttributesResult"];
2727
export type ConcreteObjectStoreModel = components["schemas"]["ConcreteObjectStoreModel"];
2828
export type MessageException = components["schemas"]["MessageExceptionModel"];
29-
export type DatasetHash = components["schemas"]["DatasetHash"];
29+
export type DatasetHash = components["schemas"]["DatasetHash-Output"];
3030
export type DatasetSource = components["schemas"]["DatasetSource"];
3131
export type DatasetTransform = components["schemas"]["DatasetSourceTransform"];
3232
export type StoreExportPayload = components["schemas"]["StoreExportPayload"];

‎client/src/api/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export function canMutateHistory(history: AnyHistory): boolean {
308308
return !history.purged && !history.archived;
309309
}
310310

311-
export type DatasetHash = components["schemas"]["DatasetHash"];
311+
export type DatasetHash = components["schemas"]["DatasetHash-Output"];
312312

313313
export type DatasetSource = components["schemas"]["DatasetSource"];
314314
export type DatasetTransform = components["schemas"]["DatasetSourceTransform"];

‎client/src/api/schema/schema.ts‎

Lines changed: 229 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,6 +1090,23 @@ export interface paths {
10901090
patch?: never;
10911091
trace?: never;
10921092
};
1093+
"/api/file_landings": {
1094+
parameters: {
1095+
query?: never;
1096+
header?: never;
1097+
path?: never;
1098+
cookie?: never;
1099+
};
1100+
get?: never;
1101+
put?: never;
1102+
/** Create File Landing */
1103+
post: operations["create_file_landing_api_file_landings_post"];
1104+
delete?: never;
1105+
options?: never;
1106+
head?: never;
1107+
patch?: never;
1108+
trace?: never;
1109+
};
10931110
"/api/file_source_instances": {
10941111
parameters: {
10951112
query?: never;
@@ -7408,6 +7425,75 @@ export interface components {
74087425
/** Item Ids */
74097426
item_ids: string[];
74107427
};
7428+
/** CollectionElementCollectionRequestUri */
7429+
CollectionElementCollectionRequestUri: {
7430+
/**
7431+
* Class
7432+
* @constant
7433+
*/
7434+
class: "Collection";
7435+
/** Collection Type */
7436+
collection_type: string;
7437+
/** Elements */
7438+
elements: (
7439+
| components["schemas"]["CollectionElementCollectionRequestUri"]
7440+
| components["schemas"]["CollectionElementDataRequestUri"]
7441+
)[];
7442+
/**
7443+
* Identifier
7444+
* @description A unique identifier for this element within the collection.
7445+
*/
7446+
identifier: string;
7447+
};
7448+
/** CollectionElementDataRequestUri */
7449+
CollectionElementDataRequestUri: {
7450+
/**
7451+
* Class
7452+
* @constant
7453+
*/
7454+
class: "File";
7455+
/** Created From Basename */
7456+
created_from_basename?: string | null;
7457+
/**
7458+
* Dbkey
7459+
* @default ?
7460+
*/
7461+
dbkey: string;
7462+
/**
7463+
* Deferred
7464+
* @default false
7465+
*/
7466+
deferred: boolean;
7467+
/** Ext */
7468+
ext: string;
7469+
/** Hashes */
7470+
hashes?: components["schemas"]["DatasetHash-Input"][] | null;
7471+
/**
7472+
* Identifier
7473+
* @description A unique identifier for this element within the collection.
7474+
*/
7475+
identifier: string;
7476+
/** Info */
7477+
info?: string | null;
7478+
/** Location */
7479+
location: string;
7480+
/** Name */
7481+
name?: string | null;
7482+
/**
7483+
* Space To Tab
7484+
* @default false
7485+
*/
7486+
space_to_tab: boolean;
7487+
/** Src */
7488+
src?: null;
7489+
/** Tags */
7490+
tags?: string[] | null;
7491+
/**
7492+
* To Posix Lines
7493+
* @default false
7494+
*/
7495+
to_posix_lines: boolean;
7496+
};
74117497
/** CollectionElementIdentifier */
74127498
CollectionElementIdentifier: {
74137499
/**
@@ -7999,6 +8085,23 @@ export interface components {
79998085
*/
80008086
target: string;
80018087
};
8088+
/** CreateFileLandingPayload */
8089+
CreateFileLandingPayload: {
8090+
/** Client Secret */
8091+
client_secret?: string | null;
8092+
/** Origin */
8093+
origin?: string | null;
8094+
/**
8095+
* Public
8096+
* @default false
8097+
*/
8098+
public: boolean;
8099+
/** Request State */
8100+
request_state: (
8101+
| components["schemas"]["FileRequestUri"]
8102+
| components["schemas"]["DataRequestCollectionUri"]
8103+
)[];
8104+
};
80028105
/** CreateHistoryContentFromStore */
80038106
CreateHistoryContentFromStore: {
80048107
model_store_format?: components["schemas"]["ModelStoreFormat"] | null;
@@ -9620,6 +9723,30 @@ export interface components {
96209723
*/
96219724
type: "data";
96229725
};
9726+
/** DataRequestCollectionUri */
9727+
DataRequestCollectionUri: {
9728+
/**
9729+
* @description discriminator enum property added by openapi-typescript
9730+
* @enum {string}
9731+
*/
9732+
class: "Collection";
9733+
/** Collection Type */
9734+
collection_type: string;
9735+
/**
9736+
* Deferred
9737+
* @default false
9738+
*/
9739+
deferred: boolean;
9740+
/** Elements */
9741+
elements: (
9742+
| components["schemas"]["CollectionElementCollectionRequestUri"]
9743+
| components["schemas"]["CollectionElementDataRequestUri"]
9744+
)[];
9745+
/** Name */
9746+
name?: string | null;
9747+
/** Src */
9748+
src?: null;
9749+
};
96239750
/** DatasetAssociationRoles */
96249751
DatasetAssociationRoles: {
96259752
/**
@@ -9701,7 +9828,17 @@ export interface components {
97019828
*/
97029829
DatasetExtraFiles: components["schemas"]["ExtraFileEntry"][];
97039830
/** DatasetHash */
9704-
DatasetHash: {
9831+
"DatasetHash-Input": {
9832+
/**
9833+
* Hash Function
9834+
* @enum {string}
9835+
*/
9836+
hash_function: "MD5" | "SHA-1" | "SHA-256" | "SHA-512";
9837+
/** Hash Value */
9838+
hash_value: string;
9839+
};
9840+
/** DatasetHash */
9841+
"DatasetHash-Output": {
97059842
/**
97069843
* Extra Files Path
97079844
* @description The path to the extra files used to generate the hash.
@@ -11419,6 +11556,50 @@ export interface components {
1141911556
/** visible */
1142011557
visible: boolean;
1142111558
};
11559+
/** FileRequestUri */
11560+
FileRequestUri: {
11561+
/**
11562+
* @description discriminator enum property added by openapi-typescript
11563+
* @enum {string}
11564+
*/
11565+
class: "File";
11566+
/** Created From Basename */
11567+
created_from_basename?: string | null;
11568+
/**
11569+
* Dbkey
11570+
* @default ?
11571+
*/
11572+
dbkey: string;
11573+
/**
11574+
* Deferred
11575+
* @default false
11576+
*/
11577+
deferred: boolean;
11578+
/** Ext */
11579+
ext: string;
11580+
/** Hashes */
11581+
hashes?: components["schemas"]["DatasetHash-Input"][] | null;
11582+
/** Info */
11583+
info?: string | null;
11584+
/** Location */
11585+
location: string;
11586+
/** Name */
11587+
name?: string | null;
11588+
/**
11589+
* Space To Tab
11590+
* @default false
11591+
*/
11592+
space_to_tab: boolean;
11593+
/** Src */
11594+
src?: null;
11595+
/** Tags */
11596+
tags?: string[] | null;
11597+
/**
11598+
* To Posix Lines
11599+
* @default false
11600+
*/
11601+
to_posix_lines: boolean;
11602+
};
1142211603
/** FileSourceTemplateSummaries */
1142311604
FileSourceTemplateSummaries: components["schemas"]["FileSourceTemplateSummary"][];
1142411605
/** FileSourceTemplateSummary */
@@ -12271,7 +12452,7 @@ export interface components {
1227112452
* Hashes
1227212453
* @description The list of hashes associated with this dataset.
1227312454
*/
12274-
hashes?: components["schemas"]["DatasetHash"][] | null;
12455+
hashes?: components["schemas"]["DatasetHash-Output"][] | null;
1227512456
/**
1227612457
* HDA or LDDA
1227712458
* @description Whether this dataset belongs to a history (HDA) or a library (LDDA).
@@ -12539,7 +12720,7 @@ export interface components {
1253912720
* Hashes
1254012721
* @description The list of hashes associated with this dataset.
1254112722
*/
12542-
hashes: components["schemas"]["DatasetHash"][];
12723+
hashes: components["schemas"]["DatasetHash-Output"][];
1254312724
/**
1254412725
* HDA or LDDA
1254512726
* @description Whether this dataset belongs to a history (HDA) or a library (LDDA).
@@ -26782,6 +26963,51 @@ export interface operations {
2678226963
};
2678326964
};
2678426965
};
26966+
create_file_landing_api_file_landings_post: {
26967+
parameters: {
26968+
query?: never;
26969+
header?: {
26970+
/** @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. */
26971+
"run-as"?: string | null;
26972+
};
26973+
path?: never;
26974+
cookie?: never;
26975+
};
26976+
requestBody: {
26977+
content: {
26978+
"application/json": components["schemas"]["CreateFileLandingPayload"];
26979+
};
26980+
};
26981+
responses: {
26982+
/** @description Successful Response */
26983+
200: {
26984+
headers: {
26985+
[name: string]: unknown;
26986+
};
26987+
content: {
26988+
"application/json": components["schemas"]["ToolLandingRequest"];
26989+
};
26990+
};
26991+
/** @description Request Error */
26992+
"4XX": {
26993+
headers: {
26994+
[name: string]: unknown;
26995+
};
26996+
content: {
26997+
"application/json": components["schemas"]["MessageExceptionModel"];
26998+
};
26999+
};
27000+
/** @description Server Error */
27001+
"5XX": {
27002+
headers: {
27003+
[name: string]: unknown;
27004+
};
27005+
content: {
27006+
"application/json": components["schemas"]["MessageExceptionModel"];
27007+
};
27008+
};
27009+
};
27010+
};
2678527011
file_sources__instances_index: {
2678627012
parameters: {
2678727013
query?: never;

‎client/src/components/Dataset/DatasetView.vue‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { usePersistentToggle } from "@/composables/persistentToggle";
88
import { useDatasetStore } from "@/stores/datasetStore";
99
import { useDatatypesMapperStore } from "@/stores/datatypesMapperStore";
1010
import { useDatatypeStore } from "@/stores/datatypeStore";
11+
import { withPrefix } from "@/utils/redirect";
1112
import { bytesToString } from "@/utils/utils";
1213
1314
import DatasetError from "../DatasetInformation/DatasetError.vue";
@@ -56,6 +57,7 @@ const showError = computed(
5657
const isAutoDownloadType = computed(
5758
() => dataset.value && datatypeStore.isDatatypeAutoDownload(dataset.value.file_ext),
5859
);
60+
const downloadUrl = computed(() => withPrefix(`/datasets/${props.datasetId}/display`));
5961
const preferredVisualization = computed(
6062
() => dataset.value && datatypeStore.getPreferredVisualization(dataset.value.file_ext),
6163
);
@@ -195,7 +197,7 @@ watch(
195197
<h4>Download Required</h4>
196198
<p>This file type ({{ dataset.file_ext }}) will download automatically when accessed directly.</p>
197199
<p>File size: <strong v-html="bytesToString(dataset.file_size || 0, false)" /></p>
198-
<a :href="`/datasets/${datasetId}/display`" class="btn btn-primary mt-2" download>
200+
<a :href="downloadUrl" class="btn btn-primary mt-2" download>
199201
<FontAwesomeIcon :icon="faFileAlt" class="mr-1" /> Download File
200202
</a>
201203
</div>
@@ -222,7 +224,7 @@ watch(
222224
<h4>Download Required</h4>
223225
<p>This file type ({{ dataset.file_ext }}) will download automatically when accessed directly.</p>
224226
<p>File size: <strong v-html="bytesToString(dataset.file_size || 0, false)" /></p>
225-
<a :href="`/datasets/${datasetId}/display`" class="btn btn-primary mt-2" download>
227+
<a :href="downloadUrl" class="btn btn-primary mt-2" download>
226228
<FontAwesomeIcon :icon="faFileAlt" class="mr-1" /> Download File
227229
</a>
228230
</div>

‎client/src/components/History/HistoryList.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,9 +189,9 @@ const {
189189
);
190190
await onDeleteHistory();
191191
},
192-
expectedKeyDownClass: "history-card",
192+
expectedKeyDownClass: "history-card-in-list",
193193
getAttributeForRangeSelection(item) {
194-
return `g-card-${item.id}`;
194+
return `g-card-history-${item.id}`;
195195
},
196196
});
197197

‎client/src/components/Workflow/List/WorkflowList.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ const {
138138
);
139139
deleteInModal();
140140
},
141-
expectedKeyDownClass: "workflow-card",
141+
expectedKeyDownClass: "workflow-card-in-list",
142142
getAttributeForRangeSelection(item) {
143143
return `g-card-${item.id}`;
144144
},

‎client/src/components/WorkflowInvocationState/TabsDisabledAlert.vue‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<script setup lang="ts">
2+
import { BAlert } from "bootstrap-vue";
3+
4+
import GLink from "../BaseComponents/GLink.vue";
5+
6+
const props = defineProps<{
7+
invocationId: string;
8+
tooltip: string;
9+
}>();
10+
</script>
11+
12+
<template>
13+
<BAlert variant="info" show>
14+
<span v-localize>{{ props.tooltip }}</span>
15+
View the invocation
16+
<GLink :to="`/workflows/invocations/${props.invocationId}`">Overview</GLink>
17+
instead.
18+
</BAlert>
19+
</template>

0 commit comments

Comments
 (0)