summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/ng2/pages
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-ui/src/app/ng2/pages')
-rw-r--r--catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts19
-rw-r--r--catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.html7
-rw-r--r--catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts18
3 files changed, 25 insertions, 19 deletions
diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts
index 7c0f23291b..9db24b6071 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/interface-operation.page.component.ts
@@ -315,10 +315,12 @@ export class InterfaceOperationComponent {
private createOperation = (operation: OperationModel): void => {
this.ComponentServiceNg2.createInterfaceOperation(this.component, operation).subscribe((response: OperationModel) => {
this.openOperation = null;
+
let curInterf = _.find(
this.interfaces,
interf => interf.type === operation.interfaceType
);
+
if (!curInterf) {
curInterf = new UIInterfaceModel({
type: response.interfaceType,
@@ -327,11 +329,13 @@ export class InterfaceOperationComponent {
});
this.interfaces.push(curInterf);
}
- curInterf.operations.push(new UIOperationModel(response));
+
+ const newOpModel = new UIOperationModel(response);
+ curInterf.operations.push(newOpModel);
this.sortInterfaces();
- if (operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.EXTERNAL) {
- this.ComponentServiceNg2.uploadInterfaceOperationArtifact(this.component, response, operation).subscribe();
+ if (operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.EXTERNAL && operation.artifactData) {
+ this.ComponentServiceNg2.uploadInterfaceOperationArtifact(this.component, newOpModel, operation).subscribe();
} else if (response.workflowId && operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.EXISTING) {
this.WorkflowServiceNg2.associateWorkflowArtifact(this.component, response).subscribe();
} else if (operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.NEW) {
@@ -341,7 +345,7 @@ export class InterfaceOperationComponent {
}
private updateOperation = (operation: OperationModel): void => {
- this.ComponentServiceNg2.updateInterfaceOperation(this.component, operation).subscribe(newOperation => {
+ this.ComponentServiceNg2.updateInterfaceOperation(this.component, operation).subscribe((newOperation: OperationModel) => {
this.openOperation = null;
let oldOpIndex, oldInterf;
@@ -356,11 +360,12 @@ export class InterfaceOperationComponent {
oldInterf.operations.splice(oldOpIndex, 1);
const newInterf = _.find(this.interfaces, interf => interf.type === operation.interfaceType);
- newInterf.operations.push(new UIOperationModel(newOperation));
+ const newOpModel = new UIOperationModel(newOperation);
+ newInterf.operations.push(newOpModel);
this.sortInterfaces();
- if (operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.EXTERNAL) {
- this.ComponentServiceNg2.uploadInterfaceOperationArtifact(this.component, newOperation, operation).subscribe();
+ if (operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.EXTERNAL && operation.artifactData) {
+ this.ComponentServiceNg2.uploadInterfaceOperationArtifact(this.component, newOpModel, operation).subscribe();
} else if (newOperation.workflowId && operation.workflowAssociationType === WORKFLOW_ASSOCIATION_OPTIONS.EXISTING) {
this.WorkflowServiceNg2.associateWorkflowArtifact(this.component, newOperation).subscribe();
}
diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.html b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.html
index 5faddd829c..8f70f7f584 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.html
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.html
@@ -86,15 +86,15 @@
<div
*ngIf="isUsingExternalWF()"
class="form-item sdc-input">
- <label class="sdc-input__label required">{{ 'OPERATION_ARTIFACT' | translate }}</label>
+ <label class="sdc-input__label">{{ 'OPERATION_ARTIFACT' | translate }}</label>
<div class="i-sdc-form-item i-sdc-form-file-upload">
<span
class="i-sdc-form-file-name"
data-tests-id="artifactFilename">
- {{ operation.artifactFile && operation.artifactFile.name }}
+ {{ operation.artifactFileName }}
</span>
<div
- *ngIf="operation.artifactFile && operation.artifactFile.name"
+ *ngIf="operation.artifactFileName"
class="i-sdc-form-file-upload-x-btn"
data-tests-id="clearArtifact"
(click)="onChangeArtifactFile({ target: {} })"></div>
@@ -107,6 +107,7 @@
maxsize="10240"
data-tests-id="artifactUpload"
(change)="onChangeArtifactFile($event)"
+ (click)="$event.target.value = ''"
/>
<div class="file-upload-browse-btn">Browse</div>
</label>
diff --git a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts
index 7b36062427..a574460478 100644
--- a/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts
+++ b/catalog-ui/src/app/ng2/pages/interface-operation/operation-creator/operation-creator.component.ts
@@ -186,6 +186,8 @@ export class OperationCreatorComponent implements OperationCreatorInput {
if (inputOperation) {
this.onSelectInterface(new DropDownOption(this.operation.interfaceType));
+ this.operation.artifactFileName = this.operation.artifactFileName || this.operation.implementation.artifactName;
+
if (this.enableWorkflowAssociation && inputOperation.workflowVersionId && this.isUsingExistingWF(inputOperation)) {
this.assignInputParameters[this.operation.workflowId] = {[inputOperation.workflowVersionId]: []};
this.assignOutputParameters[this.operation.workflowId] = {[inputOperation.workflowVersionId]: []};
@@ -317,13 +319,13 @@ export class OperationCreatorComponent implements OperationCreatorInput {
).sort((a, b) => a.name.localeCompare(b.name)),
(version: any) => {
if (!this.assignInputParameters[this.operation.workflowId][version.id] && version.id !== selectedVersionId) {
- this.assignInputParameters[this.operation.workflowId][version.id] = _.map(version.inputs, (input: OperationParameter) => {
- return new OperationParameter({...input, type: input.type.toLowerCase(), required: Boolean(input.required)});
+ this.assignInputParameters[this.operation.workflowId][version.id] = _.map(version.inputs, (input: any) => {
+ return new OperationParameter({...input, type: input.type.toLowerCase(), required: Boolean(input.mandatory)});
})
.sort((a, b) => a.name.localeCompare(b.name));
- this.assignOutputParameters[this.operation.workflowId][version.id] = _.map(version.outputs, (output: OperationParameter) => {
- return new OperationParameter({...output, type: output.type.toLowerCase(), required: Boolean(output.required)});
+ this.assignOutputParameters[this.operation.workflowId][version.id] = _.map(version.outputs, (output: any) => {
+ return new OperationParameter({...output, type: output.type.toLowerCase(), required: Boolean(output.mandatory)});
})
.sort((a, b) => a.name.localeCompare(b.name));
}
@@ -383,9 +385,9 @@ export class OperationCreatorComponent implements OperationCreatorInput {
onChangeArtifactFile(e: any) {
const file = e.target.files && e.target.files[0];
- this.operation.artifactFile = file;
+ this.operation.artifactFileName = file && file.name;
- if (!this.operation.artifactFile) {
+ if (!this.operation.artifactFileName) {
this.operation.artifactData = null;
this.validityChanged();
return;
@@ -495,9 +497,7 @@ export class OperationCreatorComponent implements OperationCreatorInput {
checkFormValidForSubmit = (): boolean => {
return this.operation.name &&
- (this.isUsingExternalWF() ?
- (this.operation.artifactFile && this.operation.artifactFile.name) :
- (!this.isUsingExistingWF() || this.operation.workflowVersionId)) &&
+ (!this.isUsingExistingWF() || this.operation.workflowVersionId) &&
this.isParamsValid();
}