diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.html index f4854b1d..579738a7 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.html @@ -54,7 +54,7 @@ diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html index 618895b3..d14a2921 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html @@ -8,11 +8,13 @@
-
-

- error_outline - {{note}} -

+
+ +
+
error_outline
+
{{note}}
+
+
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.html index 8537371d..6abcd929 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.html @@ -79,6 +79,9 @@ {{transforamtionForm.value[transFormControl.controlName]}} + + select + : diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.ts b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.ts index cc066737..548b603d 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.ts @@ -249,7 +249,7 @@ export class TransformationsComponent implements OnInit, OnChanges { }) } else { - const message = 'Please provide all mandatory fields' + const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide spec json' this.showSnackBar(message) } } @@ -286,7 +286,7 @@ export class TransformationsComponent implements OnInit, OnChanges { header = 'Upload Course Catalog' break case 'transformProgressJson': - header = 'Upload Course Pregress' + header = 'Upload Course Progress' break case 'certificateTemplateUrl': header = 'Upload Course Certificate' diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.ts b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.ts index 14242c2b..946a6d62 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.ts @@ -125,7 +125,10 @@ export class ViaApiComponent implements OnInit, OnChanges { } }) this.viaApiFormGroup.controls.apiUrl.valueChanges.subscribe((event: string) => { - if (event !== this.displayUrl) { + const trimValue = event.replace(' ', '') + if (trimValue !== event) { + this.viaApiFormGroup.controls.apiUrl.patchValue(trimValue) + } else if (event !== this.displayUrl) { this.displayUrl = event this.apiUrlEdited = true this.constructParamsFormArray() @@ -268,7 +271,7 @@ export class ViaApiComponent implements OnInit, OnChanges { this.authenticationFormGroup.controls.rawData.patchValue(authPayload) } - const transformContent = _.get(configurationDetails, this.transformationType, _.get(this.providerConfiguration, this.transformationType)) + const transformContent = _.get(this.providerDetails, this.transformationType, _.get(this.providerConfiguration, this.transformationType)) this.transformationSpecForm.patchValue(transformContent) } @@ -323,13 +326,13 @@ export class ViaApiComponent implements OnInit, OnChanges { get getUpdateBtnText(): string { let btnText = '' if (this.transformationType === 'transformContentViaApi') { - if (this.providerConfiguration.trasformContentViaApi) { + if (this.providerConfiguration && this.providerConfiguration.transformContentViaApi) { btnText = 'Update Transform Content' } else { btnText = 'Save Transform Content' } } else if (this.transformationType === 'transformProgressViaApi') { - if (this.providerConfiguration.transformProgressViaApi) { + if (this.providerConfiguration && this.providerConfiguration.transformProgressViaApi) { btnText = 'Update Transform Progress' } else { btnText = 'Save Transform Progress' @@ -392,6 +395,7 @@ export class ViaApiComponent implements OnInit, OnChanges { serviceDetails['serviceCode'] = this.servicesFormGroup.controls.serviceCode.value.toUpperCase() const params = this.getParamsAndUrl() const isFormData = this.bodyFormGroup.value.tableListFormArray[0].key ? true : false + const authPayload = _.get(this.authenticationFormGroup, 'value.rawData', '{}') const formBody = { isFormData, requestMethod: this.viaApiFormGroup.controls.apiType.value, @@ -411,7 +415,7 @@ export class ViaApiComponent implements OnInit, OnChanges { headerMap: this.generateObjectFromForm(this.headersFormGroup.value.tableListFormArray), urlMap: this.generateObjectFromForm(this.paramsFormGroup.value.tableListFormArray, true) }, - authPayload: this.authenticationFormGroup.value.rawData, + authPayload: authPayload ? authPayload : {}, strictCache: serviceDetails.strictCache, strictCacheTimeInMinutes: serviceDetails.strictCacheTimeInMinutes } @@ -477,7 +481,7 @@ export class ViaApiComponent implements OnInit, OnChanges { }) } else { - const message = 'Please provide all mandatory fields' + const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide spec json' this.showSnackBar(message) } }