Skip to content

Commit 95d4ed4

Browse files
authored
fix bug and update codegen (#193)
1 parent 81b10bf commit 95d4ed4

27 files changed

+629
-101
lines changed

frontend/src/actions/file.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,10 @@ export function fileDeleted(fileId){
115115
}
116116

117117
export const CREATE_FILE = "CREATE_FILE";
118-
export function fileCreated(selectedDatasetId, forderId, formData){
118+
export function fileCreated(selectedDatasetId, folderId, formData){
119119
return (dispatch) => {
120120
formData["file"] = dataURItoFile(formData["file"]);
121-
return V2.DatasetsService.saveFileApiV2DatasetsDatasetIdFilesPost(selectedDatasetId, forderId, formData)
121+
return V2.DatasetsService.saveFileApiV2DatasetsDatasetIdFilesPost(selectedDatasetId, formData, folderId)
122122
.then(file => {
123123
dispatch({
124124
type: CREATE_FILE,
@@ -127,7 +127,7 @@ export function fileCreated(selectedDatasetId, forderId, formData){
127127
});
128128
})
129129
.catch(reason => {
130-
dispatch(handleErrors(reason, fileCreated(selectedDatasetId, forderId, formData)));
130+
dispatch(handleErrors(reason, fileCreated(selectedDatasetId, formData, folderId)));
131131
});
132132
};
133133
}

frontend/src/openapi/v2/index.ts

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,18 @@ export type { DatasetBase } from './models/DatasetBase';
1515
export type { DatasetIn } from './models/DatasetIn';
1616
export type { DatasetOut } from './models/DatasetOut';
1717
export type { DatasetPatch } from './models/DatasetPatch';
18-
export type { ExtractorIdentifier } from './models/ExtractorIdentifier';
19-
export type { ExtractorIn } from './models/ExtractorIn';
20-
export type { ExtractorOut } from './models/ExtractorOut';
18+
export type { EventListenerIn } from './models/EventListenerIn';
19+
export type { EventListenerOut } from './models/EventListenerOut';
20+
export type { ExtractorInfo } from './models/ExtractorInfo';
21+
export type { FeedIn } from './models/FeedIn';
22+
export type { FeedListener } from './models/FeedListener';
23+
export type { FeedOut } from './models/FeedOut';
2124
export type { FileOut } from './models/FileOut';
2225
export type { FileVersion } from './models/FileVersion';
2326
export type { FolderIn } from './models/FolderIn';
2427
export type { FolderOut } from './models/FolderOut';
2528
export type { HTTPValidationError } from './models/HTTPValidationError';
29+
export type { LegacyEventListenerIn } from './models/LegacyEventListenerIn';
2630
export type { MetadataAgent } from './models/MetadataAgent';
2731
export type { MetadataConfig } from './models/MetadataConfig';
2832
export type { MetadataDefinitionIn } from './models/MetadataDefinitionIn';
@@ -34,15 +38,22 @@ export type { MetadataIn } from './models/MetadataIn';
3438
export type { MetadataOut } from './models/MetadataOut';
3539
export type { MetadataPatch } from './models/MetadataPatch';
3640
export type { MongoDBRef } from './models/MongoDBRef';
41+
export type { Repository } from './models/Repository';
42+
export type { SearchCriteria } from './models/SearchCriteria';
43+
export type { SearchObject } from './models/SearchObject';
3744
export type { UserIn } from './models/UserIn';
3845
export type { UserOut } from './models/UserOut';
3946
export type { ValidationError } from './models/ValidationError';
4047

4148
export { AuthService } from './services/AuthService';
4249
export { CollectionsService } from './services/CollectionsService';
4350
export { DatasetsService } from './services/DatasetsService';
51+
export { ElasticsearchService } from './services/ElasticsearchService';
52+
export { ExtractorsService } from './services/ExtractorsService';
53+
export { FeedsService } from './services/FeedsService';
4454
export { FilesService } from './services/FilesService';
4555
export { FoldersService } from './services/FoldersService';
56+
export { ListenersService } from './services/ListenersService';
4657
export { LoginService } from './services/LoginService';
4758
export { MetadataService } from './services/MetadataService';
4859
export { ServiceService } from './services/ServiceService';

frontend/src/openapi/v2/models/Body_get_dataset_metadata_api_v2_datasets__dataset_id__metadata_get.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
/* eslint-disable */
44

55
export type Body_get_dataset_metadata_api_v2_datasets__dataset_id__metadata_get = {
6-
extractor_name?: string;
7-
extractor_version?: number;
6+
listener_name?: string;
7+
listener_version?: number;
88
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
/* istanbul ignore file */
2+
/* tslint:disable */
3+
/* eslint-disable */
4+
5+
/**
6+
* On submission, minimum info for a listener is name, version and description. Clowder will use name and version to locate queue.
7+
*/
8+
export type EventListenerIn = {
9+
name: string;
10+
version?: string;
11+
description?: string;
12+
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/* istanbul ignore file */
2+
/* tslint:disable */
3+
/* eslint-disable */
4+
5+
import type { ExtractorInfo } from './ExtractorInfo';
6+
import type { UserOut } from './UserOut';
7+
8+
/**
9+
* EventListeners have a name, version, author, description, and optionally properties where extractor_info will be saved.
10+
*/
11+
export type EventListenerOut = {
12+
id?: string;
13+
name: string;
14+
version?: string;
15+
description?: string;
16+
creator?: UserOut;
17+
created?: string;
18+
modified?: string;
19+
properties?: ExtractorInfo;
20+
}

frontend/src/openapi/v2/models/ExtractorIdentifier.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

frontend/src/openapi/v2/models/ExtractorIn.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
/* istanbul ignore file */
2+
/* tslint:disable */
3+
/* eslint-disable */
4+
5+
import type { Repository } from './Repository';
6+
7+
/**
8+
* Currently for extractor_info JSON from Clowder v1 extractors for use with to /api/extractors endpoint.
9+
*/
10+
export type ExtractorInfo = {
11+
author: string;
12+
process: any;
13+
maturity?: string;
14+
contributors?: Array<string>;
15+
contexts?: Array<any>;
16+
repository?: Array<Repository>;
17+
external_services?: Array<string>;
18+
libraries?: Array<string>;
19+
bibtex?: Array<string>;
20+
default_labels?: Array<string>;
21+
categories?: Array<string>;
22+
parameters?: Array<any>;
23+
}

frontend/src/openapi/v2/models/ExtractorOut.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
/* istanbul ignore file */
2+
/* tslint:disable */
3+
/* eslint-disable */
4+
5+
import type { FeedListener } from './FeedListener';
6+
import type { SearchObject } from './SearchObject';
7+
8+
/**
9+
* A Job Feed is a saved set of search criteria with some number of Event Listeners that can be triggered when new
10+
* resources match the saved search criteria for the Feed.
11+
*/
12+
export type FeedIn = {
13+
name: string;
14+
search: SearchObject;
15+
listeners?: Array<FeedListener>;
16+
}

0 commit comments

Comments
 (0)