Skip to content

Commit

Permalink
Merge pull request #31 from Inist-CNRS/fix/wrapper-param-api
Browse files Browse the repository at this point in the history
Correctly handle wrapper param
  • Loading branch information
AlasDiablo authored Apr 17, 2024
2 parents 7813175 + 739b7fd commit aea35e9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 14 deletions.
8 changes: 2 additions & 6 deletions tdm-be/src/controller/traitment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import multer from 'multer';

import type { Request, Response } from 'express';
import type { Processing } from '~/model/ProcessingModel';
import type { Parameter } from '~/model/Request';
import type { Traitment } from '~/model/Traitment';

const router = express.Router();
Expand Down Expand Up @@ -119,11 +118,8 @@ router.post(

// Get wrapper param
if (traitement.wrapper && traitement.wrapper.parameters) {
const tmpWrapperParam = traitement.wrapper.parameters
.filter((param) => param !== undefined && param.value !== undefined && param.name !== undefined)
.find((param) => (param as Required<Parameter>).name === 'value') as Required<Parameter> | undefined;
if (tmpWrapperParam) {
wrapperParam = tmpWrapperParam.value;
if (traitement.wrapper.parameters.length >= 1) {
wrapperParam = traitement.wrapper.parameters[0];
}
}

Expand Down
9 changes: 1 addition & 8 deletions tdm-be/src/model/Request.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
export class Parameter {
displayName?: string;
name?: string;
value?: string;
}

export class Request {
label?: string;
url = '';
parameters?: Parameter[];
fileType?: string[];
parameters?: string[];
description?: string;
}
3 changes: 3 additions & 0 deletions tdm-fe/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit aea35e9

Please sign in to comment.