From 2f363002854a4f704a9eeccb752831ccc7159b79 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Tue, 7 Jan 2025 17:18:18 +0530 Subject: [PATCH 01/39] new ui changes to add spec and map form in cios transforamtions --- .../provider-details.component.ts | 21 ++++--- .../transformations.component.html | 63 +++++++++++-------- .../transformations.component.scss | 12 +++- .../transformations.component.ts | 46 ++++++++++---- 4 files changed, 95 insertions(+), 47 deletions(-) diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts index b5d93236..552fb128 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts @@ -197,7 +197,7 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { lastModified: Date.now(), }) } - }, 'image/png') + }, 'image/png') this.imageUrl = canvas.toDataURL('image/png') } @@ -316,10 +316,12 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { contentPartnerName: formDetails.contentPartnerName, providerTips: formDetails.providerTips, link: this.thumbNailUrl, - documentUrl: this.uploadedPdfUrl, - documentUploadedDate: this.fileUploadedDate, partnerCode: formDetails.partnerCode.toUpperCase(), } + if (this.uploadedPdfUrl) { + formBody['documentUrl'] = this.uploadedPdfUrl + formBody['documentUploadedDate'] = this.fileUploadedDate + } this.marketPlaceSvc.createProvider(formBody).subscribe({ next: (responce: any) => { @@ -330,7 +332,7 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { this.showSnackBar(successMsg) const providerId = _.get(responce, 'result.id') this.router.navigate([`/app/home/marketplace-providers/onboard-partner/${providerId}`]) - }, 1000) + }, 1000) } }, error: (error: HttpErrorResponse) => { @@ -353,8 +355,13 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { this.providerDetalsBeforUpdate['data']['contentPartnerName'] = formDetails.contentPartnerName this.providerDetalsBeforUpdate['data']['providerTips'] = formDetails.providerTips this.providerDetalsBeforUpdate['data']['link'] = this.thumbNailUrl - this.providerDetalsBeforUpdate['data']['documentUrl'] = this.uploadedPdfUrl - this.providerDetalsBeforUpdate['data']['documentUploadedDate'] = this.fileUploadedDate + if (this.uploadedPdfUrl) { + this.providerDetalsBeforUpdate['data']['documentUrl'] = this.uploadedPdfUrl + this.providerDetalsBeforUpdate['data']['documentUploadedDate'] = this.fileUploadedDate + } else { + delete this.providerDetalsBeforUpdate['data']['documentUrl'] + delete this.providerDetalsBeforUpdate['data']['documentUploadedDate'] + } this.marketPlaceSvc.updateProvider(this.providerDetalsBeforUpdate).subscribe({ next: (responce: any) => { @@ -364,7 +371,7 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { const successMsg = 'Provider details updated successfully.' this.showSnackBar(successMsg) this.sendDetailsUpdateEvent() - }, 1000) + }, 1000) } }, error: (error: HttpErrorResponse) => { 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 93ee2f87..8537371d 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 @@ -56,32 +56,43 @@
-
-
- -
- {{transFormControl.lable}} - : - - - - - {{header}} - - - - - {{transforamtionForm.value[transFormControl.controlName]}} - - - - -
- -
-
+ + Map Form + Spec + + +
+
+ +
+ + + + + {{header}} + + + + + {{transforamtionForm.value[transFormControl.controlName]}} + + + + + : + {{transFormControl.lable}} +
+ +
+
+ + + + +
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss index 0cd6eafa..76f43602 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss @@ -106,7 +106,7 @@ font: 700 14px Lato; /* stylelint-disable */ color: #212529; - width: 180px; + width: 50%; } .colun { @@ -184,6 +184,16 @@ } } +:host ::ng-deep .transformationEditor { + .jsoneditor { + height: 400px; + } +} + +:host ::ng-deep .has-error .jsoneditor { + border: 1px solid red; +} + :host ::ng-deep .transformation-box { .mat-form-field-flex { height: 50px; 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 0931116d..cc066737 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 @@ -9,6 +9,7 @@ import { ConformationPopupComponent } from '../../dialogs/conformation-popup/con import { HttpErrorResponse } from '@angular/common/http' import * as XLSX from 'xlsx' import { environment } from '../../../../../../../../../../../src/environments/environment' +import { JsonEditorOptions } from 'ang-jsoneditor' @Component({ selector: 'ws-app-transformations', @@ -35,7 +36,9 @@ export class TransformationsComponent implements OnInit, OnChanges { dialogRef: any //#region (transformation variables) + transforamtionType = 'viaForm' transforamtionForm!: FormGroup + transformationSpecForm!: FormControl providerDetalsBeforUpdate: any transFormContentKeysAndControls: { lable: string, @@ -47,6 +50,7 @@ export class TransformationsComponent implements OnInit, OnChanges { executed = false uploadedFileHeadersList: string[] = [] availableHeadrsList: string[] = [] + editorOptions = new JsonEditorOptions() //#endregion //#endregion @@ -84,7 +88,15 @@ export class TransformationsComponent implements OnInit, OnChanges { } initializTransforamtionControls() { + this.transformationSpecForm = new FormControl( + _.get(this.providerDetalsBeforUpdate, this.transformationType, {}), Validators.required) this.transforamtionForm = this.formBuilder.group({}) + this.editorOptions.mode = 'text' + this.editorOptions.mainMenuBar = false + this.editorOptions.navigationBar = false + this.editorOptions.statusBar = false + this.editorOptions.enableSort = false + this.editorOptions.enableTransform = false this.providerDetalsBeforUpdate['certificateTemplateUrl'] = _.get(this.providerDetalsBeforUpdate, 'certificateTemplateUrl', '').replace(' ', '') let trasformationJson: any = {} @@ -162,7 +174,8 @@ export class TransformationsComponent implements OnInit, OnChanges { reader.onload = () => { const csvData = reader.result const csvRecordsArray = (csvData).split(/\r\n|\n/) - this.availableHeadrsList = this.getHeaderArray(csvRecordsArray) + this.uploadedFileHeadersList = this.getHeaderArray(csvRecordsArray) + this.availableHeadrsList = JSON.parse(JSON.stringify(this.uploadedFileHeadersList)) } const that = this.showSnackBar reader.onerror = function () { @@ -189,20 +202,27 @@ export class TransformationsComponent implements OnInit, OnChanges { this.providerDetalsBeforUpdate['data']['isActive'] = true const hasTransformationAlready = this.providerDetalsBeforUpdate[this.transformationType] ? true : false this.transforamtionForm.markAllAsTouched() - if (this.transforamtionForm.valid) { + this.transformationSpecForm.markAsTouched() + if ((this.transforamtionType === 'viaForm' && this.transforamtionForm.valid) || + (this.transforamtionType === 'viaSpec' && this.transformationSpecForm.valid && this.transformationSpecForm.value !== '{}')) { if (this.transformationType !== 'certificateTemplateUrl') { - const trasformContentSpec: any = {} // contains maped transform spec for db - const specValues = this.transforamtionForm.value - this.transFormContentKeysAndControls.forEach((transFormContent: any) => { - trasformContentSpec[specValues[transFormContent.controlName]] = transFormContent.path - }) - - if (hasTransformationAlready) { - this.providerDetalsBeforUpdate[this.transformationType][0]['spec'] = trasformContentSpec + if (this.transforamtionType === 'viaForm') { + const trasformContentSpec: any = {} // contains maped transform spec for db + const specValues = this.transforamtionForm.value + this.transFormContentKeysAndControls.forEach((transFormContent: any) => { + trasformContentSpec[specValues[transFormContent.controlName]] = transFormContent.path + }) + + if (hasTransformationAlready && _.get(this.providerDetalsBeforUpdate, `${this.transformationType}[0].spec`)) { + this.providerDetalsBeforUpdate[this.transformationType]['0']['spec'] = trasformContentSpec + } else { + const trasformContentJson = this.providerConfiguration.trasformContentJson + trasformContentJson[0]['spec'] = trasformContentSpec + this.providerDetalsBeforUpdate[this.transformationType] = trasformContentJson + this.transformationSpecForm.patchValue(trasformContentJson) + } } else { - const trasformContentJson = this.providerConfiguration.trasformContentJson - trasformContentJson[0]['spec'] = trasformContentSpec - this.providerDetalsBeforUpdate[this.transformationType] = trasformContentJson + this.providerDetalsBeforUpdate[this.transformationType] = this.transformationSpecForm.value } } this.marketPlaceSvc.updateProvider(this.providerDetalsBeforUpdate).subscribe({ From ca4c72a6a9fc706ea98f6a3365b1d17f4e3ed81c Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Thu, 9 Jan 2025 12:04:52 +0530 Subject: [PATCH 02/39] adding designations bulk upload and new ui changes in import designations --- .../bulk-upload/bulk-upload.component.html | 4 +- .../bulk-upload/bulk-upload.component.scss | 83 +++++++++ .../bulk-upload/bulk-upload.component.ts | 39 +++- .../designations/designations.component.html | 167 +++++++++--------- .../designations/designations.component.ts | 12 +- .../import-designation.component.html | 13 +- .../import-designation.component.scss | 10 +- .../import-designation.component.ts | 24 +-- .../routes/designation/designation.module.ts | 10 ++ .../services/designations.service.ts | 4 - .../create-mdo/services/users.service.ts | 5 + .../verify-otp/verify-otp.component.html | 3 +- .../verify-otp/verify-otp.component.scss | 27 +++ 13 files changed, 278 insertions(+), 123 deletions(-) diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html index 1fcc3258..0d17a8a2 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html @@ -1,6 +1,6 @@
- arrow_back + arrow_back
{{bulkUploadConfig?.mainHeading}}
@@ -29,7 +29,7 @@
- CSV file logo + CSV file logo
{{bulkUploadConfig?.supportedFileTypeText2}}
diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss index e69de29b..2f88c1c8 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss @@ -0,0 +1,83 @@ + +.bulk-container, .file-container { + box-shadow: 0px 1px 5px 0px #0000001F, 0px 2px 2px 0px #00000024, 0px 3px 1px -2px #00000033; + padding: 24px; + border: 1px solid rgba(0, 0, 0, 0.2); + + .label { + font-size: 12px; + font-weight: 400; + color: rgba($color: #000000, $alpha: 0.6); + } + + .value { + font-size: 14px; + line-height: 18px; + color: rgba($color: #000000, $alpha: 0.88); + word-break: break-all; + } + + .outline-button { + padding: 8px 16px; + color: #1B4CA1; + border: 1px solid #1B4CA1; + background-color: #FFF; + border-radius: 4px; + cursor: pointer; + line-height: 16px; + font-size: 14px; + font-weight: 700; + } +} + +.dashed-card { + border: 1px dashed rgba(0, 0, 0, 0.2); + padding: 20px 24px; + font-size: 14px; + + .custom-ol { + margin: 0px; + padding-left: 12px; + } + + .text-primary { + color: #1B4CA1; + font-weight: bold; + } +} + +.error-msg { + color: #D13924; + font-weight: 600; + font-size: 14px; +} + +.csv-file { + height: 83px; +} + +::ng-deep .common-modal { + width: 420px; + padding: 0px; + + .mat-dialog-container { + border-radius: 12px; + background-color: #EEE !important; + } +} + +::ng-deep .progress-modal { + width: 920px; + height: 420px; + + .mat-dialog-container { + border-radius: 4px; + background-color: #FFF !important; + } +} + +@media screen and (max-width: 641px) { + ::ng-deep .common-modal, ::ng-deep .progress-modal { + max-width: 90vw !important; + } +} \ No newline at end of file diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts index b5c4ec78..70a6fad1 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, OnDestroy, AfterViewInit } from '@angular/core' +import { Component, OnInit, OnDestroy, AfterViewInit, EventEmitter, Output } from '@angular/core' import { HttpErrorResponse } from '@angular/common/http' import { ActivatedRoute } from '@angular/router' @@ -14,6 +14,7 @@ import { UsersService } from '../../../../services/users.service' import { VerifyOtpComponent } from '../../../../../home/components/verify-otp/verify-otp.component' import { FileService } from '../../services/upload.service' import { FileProgressComponent } from '../../../../../home/components/file-progress/file-progress.component' +import { DesignationsService } from '../../services/designations.service' @Component({ selector: 'ws-app-bulk-upload', @@ -21,6 +22,7 @@ import { FileProgressComponent } from '../../../../../home/components/file-progr styleUrls: ['./bulk-upload.component.scss'], }) export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { + @Output() closeComponent: EventEmitter = new EventEmitter(); lastUploadList: IBulkUploadDesignationList[] = [] private destroySubject$ = new Subject() @@ -35,6 +37,10 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { public fileType: any fileSelected!: any userProfile: any + userEmailPhone = { + email: '', + mobile: '' + } fileUploadDialogInstance: any bulkUploadConfig: any @@ -49,22 +55,36 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { public dialog: MatDialog, private usersService: UsersService, private activateRoute: ActivatedRoute, - + private designationsService: DesignationsService ) { this.configSvc = this.activateRoute.snapshot.data['configService'] this.rootOrgId = _.get(this.configSvc, 'userProfile.rootOrgId') this.userProfile = _.get(this.configSvc, 'userProfileV2') - this.bulkUploadFrameworkId = _.get(this.configSvc, 'orgReadData.frameworkid') } ngOnInit() { + this.getUserDetails() this.getBulkStatusList() this.activateRoute.data.subscribe(data => { this.bulkUploadConfig = data.pageData.data.bulkUploadConfig this.pageSize = this.bulkUploadConfig.pageSize this.sizeOptions = this.bulkUploadConfig.pageSizeOptions }) + this.bulkUploadFrameworkId = this.designationsService.frameWorkInfo ? this.designationsService.frameWorkInfo.code : this.bulkUploadFrameworkId + } + + getUserDetails() { + this.usersService.getUserDetails(this.userProfile.userId).subscribe({ + next: (result) => { + if (result) { + this.userEmailPhone = { + email: _.get(result, 'result.response.profileDetails.personalDetails.primaryEmail', this.userProfile.email), + mobile: _.get(result, 'result.response.profileDetails.personalDetails.mobile', this.userProfile.mobile) + } + } + } + }) } ngAfterViewInit(): void { @@ -115,11 +135,11 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { } sendOTP(): void { - this.generateAndVerifyOTP(this.userProfile.email ? 'email' : 'phone') + this.generateAndVerifyOTP(this.userEmailPhone.email ? 'email' : 'phone') } generateAndVerifyOTP(contactType: string, resendFlag?: string): void { - const postValue = contactType === 'email' ? this.userProfile.email : this.userProfile.mobile + const postValue = contactType === 'email' ? this.userEmailPhone.email : this.userEmailPhone.mobile this.usersService.sendOtp(postValue, contactType) .pipe(takeUntil(this.destroySubject$)) .subscribe((_res: any) => { @@ -144,7 +164,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { this.fileType = file.type this.fileSelected = file if (this.fileService.validateExcelFile(this.fileType)) { - this.verifyOTP(this.userProfile.email ? 'email' : 'phone') + this.verifyOTP(this.userEmailPhone.email ? 'email' : 'phone') // this.showFileUploadProgress() // this.uploadCSVFile() } else { @@ -155,7 +175,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { verifyOTP(contactType: string): void { const dialogRef = this.dialog.open(VerifyOtpComponent, { - data: { type: contactType, email: this.userProfile.email, mobile: this.userProfile.mobile }, + data: { type: contactType, email: this.userEmailPhone.email, mobile: this.userEmailPhone.mobile }, disableClose: false, panelClass: 'common-modal', }) @@ -187,6 +207,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { // tslint:disable-next-line }, (_err: HttpErrorResponse) => { if (!_err.ok) { + this.fileUploadDialogInstance.close() this.matSnackBar.open('Uploading CSV file failed due to some error, please try again later!') } }) @@ -202,6 +223,10 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { this.lastIndex = this.startIndex + _event.pageSize } + showMyDesignations() { + this.closeComponent.emit(true) + } + ngOnDestroy(): void { this.destroySubject$.unsubscribe() if (this.interval) { diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html index 7e70ef00..e0b57a61 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html @@ -1,100 +1,107 @@ - -
-
-
{{designationConfig.mainHeading}}
-
- + + +
+
+
{{designationConfig.mainHeading}}
+
+ - + +
-
- -
- {{designationConfig?.topsection?.heading}} - keyboard_arrow_up - keyboard_arrow_down -
-
-
-
- -
-
error_outline
- -
- -
-
-
-
- play_arrow -
- Watch how it works + +
+ {{designationConfig?.topsection?.heading}} + keyboard_arrow_up + keyboard_arrow_down +
+
+
+
+ +
+
error_outline
+ +
+ +
+
+
+
+ play_arrow +
+ Watch how it works +
-
- + -
- -
-
-
-
- search - +
+ +
+
+
+
+ search + +
-
- - -
- -
-

No designation has been imported from iGOT master.

-
-
- + + +
+ +
+

No designation has been imported from iGOT master.

+
+
+ +
+ + + + + + +
+
- - - - -
- -
- - - -
- - + +
-
- + + + + + - - + + + \ No newline at end of file diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts index bc8d2cac..164d723d 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts @@ -40,7 +40,7 @@ export class DesignationsComponent implements OnInit { }[] = [] orgId = '' showTopSection = false - isImportDesignation = false + designationMaster = 'desigantion master' constructor( private designationsService: DesignationsService, private dialog: MatDialog, @@ -115,11 +115,10 @@ export class DesignationsComponent implements OnInit { this.createFreamwork() } if (this.goToImportMaster) { - this.isImportDesignation = true + this.designationMaster = 'import designations' } }) - // this.getFrameworkInfo('0140788510336040962_odcs') } createFreamwork() { @@ -354,8 +353,13 @@ export class DesignationsComponent implements OnInit { //#endregion removeImportDesignationComp(flag: boolean): void { - this.isImportDesignation = flag + this.designationMaster = flag ? 'import designations' : 'desigantion master' this.goToImportMaster = false this.getRoutesData() } + + showDesignationMaster(flag: boolean): void { + this.designationMaster = flag ? 'desigantion master' : 'bulk upload' + this.getRoutesData() + } } diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.html b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.html index 34faeed7..87ccdd56 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.html @@ -5,7 +5,7 @@
Import from iGOT master
-
+
- Clear all
-
+
-
+

{{designation?.designation | titlecase}}

@@ -67,7 +66,7 @@
+ (click)="$event.preventDefault()">
@@ -87,7 +86,7 @@
-
diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss index 24543410..745c4105 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss @@ -96,27 +96,27 @@ } .custom-user-card { - width: 360px; + width: 324px; border: 1px solid rgba(0, 0, 0, 0.16); border-radius: 4px; - height: 82px; + height: 40px; } .disableCard { background-color: #d6d6d6; - pointer-events: none; + cursor: default !important } .custom-user-desc { display: flex; flex-direction: column; padding: 0 16px; - width: 230px; + width: 260px; white-space: nowrap; p { padding: 0; margin: 0; - width: 190px; + width: 250px; overflow: hidden; text-overflow: ellipsis; } diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.ts index b7957f8e..1e091b7c 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.ts @@ -33,9 +33,9 @@ export class ImportDesignationComponent implements OnInit, OnDestroy { igotDesignationsList: any = [] selectedDesignationsList: any = [] orgDesignationsList: any = [] - pageSize = 20 + pageSize = 30 startIndex = 0 - lastIndex = 20 + lastIndex = 30 deisgnationsCount = 0 private apiSubscription: Subscription | undefined designationsImportSuccessResponses: any = [] @@ -135,17 +135,17 @@ export class ImportDesignationComponent implements OnInit, OnDestroy { }) } - selectDesignation(checked: Boolean, id: number) { - const index = this.igotDesignationsList.findIndex((e: any) => e.id === id) + selectDesignation(index: number) { const designation = this.igotDesignationsList[index] - if (checked) { - designation['selected'] = true - this.selectedDesignationsList.push(designation) - this.designationsService.updateSelectedDesignationList(this.selectedDesignationsList) - // this.igotDesignationsList.splice(index, 1) - // this.igotDesignationsList.unshift(designation) - } else { - this.removeDesignation([designation]) + if (designation && !designation.isOrgDesignation) { + const checked = designation['selected'] !== true ? true : false + if (checked) { + designation['selected'] = true + this.selectedDesignationsList.push(designation) + this.designationsService.updateSelectedDesignationList(this.selectedDesignationsList) + } else { + this.removeDesignation([designation]) + } } } diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/designation.module.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/designation.module.ts index afc206a5..9240f84d 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/designation.module.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/designation.module.ts @@ -19,6 +19,10 @@ import { BulkUploadComponent } from './components/bulk-upload/bulk-upload.compon import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip' import { ConfigResolveService } from '../../../home/resolvers/config-resolver.service' import { ImportDesignationComponent } from './components/import-designation/import-designation.component' +import { FileService } from './services/upload.service' +import { OtpService } from './services/otp.service' +import { VerifyOtpComponent } from '../../../home/components/verify-otp/verify-otp.component' +import { MatLegacyRadioModule as MatRadioModule } from '@angular/material/legacy-radio' const routes: Routes = [ { path: '', @@ -72,6 +76,7 @@ const routes: Routes = [ DesignationsComponent, ImportDesignationComponent, BulkUploadComponent, + VerifyOtpComponent ], imports: [ CommonModule, @@ -91,6 +96,7 @@ const routes: Routes = [ MatDialogModule, PipeOrderByModule, MatTooltipModule, + MatRadioModule ], exports: [ @@ -99,5 +105,9 @@ const routes: Routes = [ ImportDesignationComponent, BulkUploadComponent, ], + providers: [ + FileService, + OtpService + ] }) export class DesignationModule { } diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/designations.service.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/designations.service.ts index 2fce1640..dc788ad3 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/designations.service.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/designations.service.ts @@ -52,10 +52,6 @@ export class DesignationsService { this.userProfile = profileDetails } - get userProfileDetails() { - return this.userProfile - } - createFrameWork(frameworkName: string, orgId: string, termName: string) { return this.http.get(API_END_POINTS.CREATE_FRAME_WORK(frameworkName, orgId, termName)) } diff --git a/project/ws/app/src/lib/routes/create-mdo/services/users.service.ts b/project/ws/app/src/lib/routes/create-mdo/services/users.service.ts index 25424332..fbed7e55 100644 --- a/project/ws/app/src/lib/routes/create-mdo/services/users.service.ts +++ b/project/ws/app/src/lib/routes/create-mdo/services/users.service.ts @@ -7,6 +7,7 @@ const API_END_POINTS = { ALL_USERS_BY_DEPARTMENT: '/apis/protected/v8/portal/spv/department', GET_ALL_KONG_USER: '/apis/proxies/v8/user/v1/search', SEARCH_USER_TABLE: '/apis/proxies/v8/user/v1/search', + USER_READ: '/apis/proxies/v8/api/user/v2/read/', SEND_OTP: '/apis/proxies/v8/otp/v1/generate', RESEND_OTP: '/apis/proxies/v8/otp/v1/generate', VERIFY_OTP: '/apis/proxies/v8/otp/v1/verify', @@ -47,6 +48,10 @@ export class UsersService { return this.http.post(`${API_END_POINTS.SEARCH_USER_TABLE}`, reqBody) } + getUserDetails(userID: string): Observable { + return this.http.get(`${API_END_POINTS.USER_READ}${userID}`) + } + sendOtp(value: any, type: string): Observable { const reqObj = { diff --git a/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.html b/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.html index f353f4c0..0357f164 100644 --- a/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.html +++ b/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.html @@ -1,8 +1,7 @@ -
+
- Email Mobile diff --git a/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.scss b/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.scss index 4811e8af..e5718475 100644 --- a/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.scss +++ b/project/ws/app/src/lib/routes/home/components/verify-otp/verify-otp.component.scss @@ -20,8 +20,35 @@ margin-bottom: 16px; } } + +.action-button { + color: #FFF; + background-color: #1B4CA1; + border: 1px solid #1B4CA1; +} + .action-button:disabled, .action-button[disabled] { opacity: 0.6; cursor: auto; } + +button { + padding: 12px 16px; + border-radius: 4px; + cursor: pointer; + line-height: 16px; + font-size: 14px; + font-weight: 700; +} + +.outline-button { + color: #1B4CA1; + border: 1px solid #1B4CA1; + background-color: #FFF; + border-radius: 4px; + cursor: pointer; + line-height: 16px; + font-size: 14px; + font-weight: 700; +} From 6d0c75ae3199b8e29a25c7ea15e53b6eb12459b9 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Thu, 9 Jan 2025 14:56:50 +0530 Subject: [PATCH 03/39] cios via csv new ui changes --- .../content-upload.component.html | 2 +- .../components/via-api/via-api.component.html | 102 +++++++++--------- .../components/via-api/via-api.component.ts | 4 +- 3 files changed, 55 insertions(+), 53 deletions(-) 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 1f94ea3a..aa95702c 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 @@ -74,7 +74,7 @@ - +
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html index 0686b2d0..7214268b 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html @@ -4,8 +4,58 @@ Configure Courses API
+ +
+ Link + info_outline +
+ +
+ +
+ + + + {{type.type}} + + + +
+
+ + + +
+ +
+ +
+ + + + + + + + + + + + + + + + + + +
+
-
+
Service Name @@ -71,7 +121,7 @@
-
+
Has Authentication @@ -102,54 +152,6 @@
-
- Link - info_outline -
- -
-
-
- - - - {{type.type}} - - - -
-
- - - -
-
-
- -
- - - - - - - - - - - - - - - - - - -
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 3d4b5d39..d25efa8a 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 @@ -134,7 +134,7 @@ export class ViaApiComponent implements OnInit, OnChanges { } get actualUrl(): string { - const actualUrl = this.actualUrl + const actualUrl = this.viaApiFormGroup.controls.apiUrl.value.split('?')[0] return actualUrl } @@ -402,7 +402,7 @@ export class ViaApiComponent implements OnInit, OnChanges { getParamsAndUrl() { const parmsAndUrl = { - url: `${this.viaApiFormGroup.controls.apiUrl.value.split('?')[0]}`, + url: `${this.actualUrl}`, urlPlaceholder: '', } const params = this.paramsFormGroup.value.tableListFormArray From a36f80cdd9737cfa9e3bb92c42297676cf2b5bef Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Thu, 16 Jan 2025 11:37:58 +0530 Subject: [PATCH 04/39] fixing: KB-8002 :- When SPV created new organisation and mdo admin of that org added the designations, then the org name is not updating in the competency role mapping it is displaying as Karmayogi Bharat --- .../designations/designations.component.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts index 164d723d..49f97397 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.ts @@ -39,6 +39,7 @@ export class DesignationsComponent implements OnInit { isMdoLeader: boolean }[] = [] orgId = '' + orgName = '' showTopSection = false designationMaster = 'desigantion master' constructor( @@ -61,11 +62,14 @@ export class DesignationsComponent implements OnInit { } initializeDefaultValues() { - this.configSvc = this.activateRoute.snapshot.data['configService'] - this.designationsService.setUserProfile(_.get(this.configSvc, 'userProfileV2')) - // this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId') - this.orgId = this.activateRoute.snapshot.params.department - this.designationConfig = this.activateRoute.snapshot.data['pageData'].data + if (this.activateRoute.snapshot) { + this.configSvc = this.activateRoute.snapshot.data['configService'] + this.designationsService.setUserProfile(_.get(this.configSvc, 'userProfileV2')) + // this.orgId = _.get(this.configSvc, 'userProfile.rootOrgId') + this.orgId = this.activateRoute.snapshot.params.department + this.designationConfig = this.activateRoute.snapshot.data['pageData'].data + this.orgName = _.get(this.activateRoute, 'snapshot.queryParams.orgName') + } this.actionMenuItem = [ // { @@ -124,7 +128,7 @@ export class DesignationsComponent implements OnInit { createFreamwork() { this.showCreateLoader = true this.loaderMsg = this.designationConfig.frameworkCreationMSg - const departmentName = _.get(this.configSvc, 'userProfile.departmentName') + const departmentName = this.orgName ? this.orgName : _.get(this.configSvc, 'userProfile.departmentName') const masterFrameWorkName = this.environment.ODCSMasterFramework this.designationsService.createFrameWork(masterFrameWorkName, this.orgId, departmentName).subscribe((res: any) => { if (_.get(res, 'result.framework')) { From 1adae5cd84173bae402faf20773c9c984bb2c009 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Thu, 16 Jan 2025 16:49:21 +0530 Subject: [PATCH 05/39] fixing KB-8121:- Start Importing Button is moving outside the boundary when clicked on MDO help center Tips expand button --- .../components/designations/designations.component.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.scss b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.scss index fd2b9b24..f7482193 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.scss +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.scss @@ -92,6 +92,7 @@ .emptyDesignations { height: calc(100vh - 600px); + min-height: 160px; } .empty-desigantions-text { From 34f1d558c66e08c3508a4836759117a5e26488dc Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Thu, 16 Jan 2025 16:52:04 +0530 Subject: [PATCH 06/39] fixing: KB-8024 :- When SPV creates new organisation and added designations using bulk upload. The file logs should be relavent to that particular organisation --- .../components/bulk-upload/bulk-upload.component.ts | 7 +++++-- .../routes/designation/services/upload.service.ts | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts index 70a6fad1..ed881769 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.ts @@ -48,6 +48,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { startIndex = 0 lastIndex: any pageSize = 0 + orgId = '' constructor( private fileService: FileService, @@ -65,6 +66,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { ngOnInit() { this.getUserDetails() + this.orgId = _.get(this.activateRoute, 'snapshot.queryParams.roleId', '') this.getBulkStatusList() this.activateRoute.data.subscribe(data => { this.bulkUploadConfig = data.pageData.data.bulkUploadConfig @@ -99,7 +101,8 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { } getBulkStatusList(): void { - this.fileService.getBulkDesignationUploadData(this.rootOrgId) + const orgId = this.orgId ? this.orgId : this.rootOrgId + this.fileService.getBulkDesignationUploadData(orgId) .pipe(takeUntil(this.destroySubject$)) .subscribe((res: any) => { this.lastUploadList = res.result.content.sort((a: IBulkUploadDesignationList, b: IBulkUploadDesignationList) => @@ -195,7 +198,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { if (this.fileSelected) { const formData: FormData = new FormData() formData.append('file', this.fileSelected) - this.fileService.bulkUploadDesignation(this.fileName, formData, this.bulkUploadFrameworkId) + this.fileService.bulkUploadDesignation(this.fileName, formData, this.bulkUploadFrameworkId, this.orgId) .pipe(takeUntil(this.destroySubject$)) .subscribe((_res: any) => { this.fileUploadDialogInstance.close() diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/upload.service.ts b/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/upload.service.ts index 27145b0b..0ff3acd3 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/upload.service.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/services/upload.service.ts @@ -17,8 +17,8 @@ const API_ENDPOINTS = { // Bulk Upload Designation BULK_UPLOAD_SAMPLE_FILE: (frameworkId: string) => `/apis/proxies/v8/designation/v1/orgMapping/sample/${frameworkId}`, - BULK_UPLOAD_DESIGNATION: (frameworkId: string) => - `/apis/proxies/v8/designation/v1/orgMapping/bulkUpload/${frameworkId}`, + BULK_UPLOAD_DESIGNATION: (frameworkId: string, orgId: string) => + `/apis/proxies/v8/designation/v1/orgMapping/bulkUpload/${orgId}/${frameworkId}`, GET_BULK_UPLOAD_DESIGNATION_DATA: (rootOrgId: string) => `/apis/proxies/v8/designation/v1/orgMapping/bulkUpload/progress/details/${rootOrgId}`, GET_BULK_UPLOAD_DESIGNATION_STATUS: (filePath: string) => @@ -75,7 +75,7 @@ export class FileService { fileSaver.saveAs(res.body, filename || 'sample.xlsx') } - }, () => (this.matSnackBar.open('Could not download the file') + }, () => (this.matSnackBar.open('Could not download the file') )) } @@ -149,9 +149,9 @@ export class FileService { return API_ENDPOINTS.BULK_UPLOAD_SAMPLE_FILE(frameworkId) } - public bulkUploadDesignation(_fileName: string, fileContent: FormData, frameworkId: string): Observable { + public bulkUploadDesignation(_fileName: string, fileContent: FormData, frameworkId: string, orgId: string): Observable { this.displayLoader$.next(true) - return this.http.post(API_ENDPOINTS.BULK_UPLOAD_DESIGNATION(frameworkId), fileContent) + return this.http.post(API_ENDPOINTS.BULK_UPLOAD_DESIGNATION(frameworkId, orgId), fileContent) .pipe(finalize(() => this.displayLoader$.next(false))) } From 0317c2932d65b647391d7b4298aeb8bbdb596032 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Fri, 17 Jan 2025 12:01:31 +0530 Subject: [PATCH 07/39] adding accordians ui in cios content upload --- .../content-upload.component.html | 84 +++++++++++-------- .../content-upload.component.scss | 12 +++ .../content-upload.component.ts | 3 +- .../transformations.component.scss | 2 +- .../components/via-api/via-api.component.html | 64 ++++++++++---- .../components/via-api/via-api.component.scss | 3 +- .../components/via-api/via-api.component.ts | 54 ++++++++---- 7 files changed, 148 insertions(+), 74 deletions(-) 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 aa95702c..f4854b1d 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 @@ -17,54 +17,64 @@ file.
-
- - -
- - - - - - - + + + + Via CSV + + + + + + + + + Via API + + + + +
- - - - - + + + + Via CSV + + + + + +
- - - - - + + + + Via CSV + + + + + +
@@ -74,7 +84,7 @@ - +
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.scss index 01402f38..f04f4eba 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.scss @@ -73,3 +73,15 @@ display: none; } +.margin-0 { + margin: 0px !important; +} + +.accoridan-description { + font: 700 20px Lato; +} + +:host ::ng-deep .mat-tab-body-content { + padding: 2px; + height: auto; +} diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts index 59309e08..28985831 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts @@ -61,7 +61,6 @@ export class ContentUploadComponent implements OnInit, OnChanges { unPublishedCoursesSearchKey = '' unPublishedCoursesTablePaginationDetails: any - uploadMode = 'viaCsv' defaultPagination = { startIndex: 0, @@ -383,7 +382,7 @@ export class ContentUploadComponent implements OnInit, OnChanges { this.showSnackBar(msg) setTimeout(() => { this.getUnPublishedCoursesList() - }, 2000) + }, 2000) } }, error: (error: HttpErrorResponse) => { diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss index 76f43602..c976e96c 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.scss @@ -1,6 +1,6 @@ .header { /* stylelint-enable */ - font: 700 20px / 30px Lato; + font: 600 16px / 30px Lato; /* stylelint-disable */ color: #212529; } diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html index 7214268b..18af17ae 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html @@ -155,23 +155,57 @@
-
-
- Transform Content -
-
-
- - -
-
- + +
+
+ Transform {{transformationType === 'trasformContentJson' ? 'Content' : 'Progress'}} +
+
+ + +
+
+ +
+ + + + + {{header}} + + + + + {{transforamtionForm.value[transFormControl.controlName]}} + + + + + : + {{transFormControl.lable}} +
+ +
+
+ + + + + +
+ +
-
+
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.scss index 243b3b60..0d417c9b 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.scss @@ -92,7 +92,7 @@ .header { /* stylelint-enable */ - font: 700 20px / 30px Lato; + font: 600 16px / 30px Lato; /* stylelint-disable */ color: #212529; } @@ -184,6 +184,7 @@ :host ::ng-deep .vai-api-tabs { .mat-tab-label { height: 38px; + min-width: fit-content; } } 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 d25efa8a..14242c2b 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 @@ -18,6 +18,7 @@ export class ViaApiComponent implements OnInit, OnChanges { @Input() providerDetails?: any @Input() viaApiTabIndex = 0 @Input() tabIndex = -1 + @Input() transformationType = '' @Output() loadProviderDetails = new EventEmitter() //#endregion @@ -34,7 +35,8 @@ export class ViaApiComponent implements OnInit, OnChanges { apiUrlEdited = false //#region (transformation variables) - transforamtionForm!: FormGroup + transformationSpecForm!: FormControl + transforamtionType = 'viaSpec' editorOptions = new JsonEditorOptions() transformationsUpdated = false providerConfiguration: any @@ -65,7 +67,7 @@ export class ViaApiComponent implements OnInit, OnChanges { this.servicesFormGroup = this.formBuilder.group({ serviceName: new FormControl('', [Validators.required, Validators.pattern(/^[a-zA-Z0-9.\-_$/:\[\] ' !]*$/)]), serviceCode: new FormControl('', [Validators.required, Validators.pattern(/^[a-zA-Z0-9.\-_$/:\[\] ' !]*$/)]), - serviceDescription: new FormControl('', [Validators.required, Validators.pattern(/^[a-zA-Z0-9.\-_$/:\[\] ' !]*$/)]), + serviceDescription: new FormControl('', [Validators.required, Validators.pattern(/^[a-zA-Z0-9,.\-_$/:\[\] ' !]*$/)]), isAuthenticated: new FormControl(false), strictCache: new FormControl(false), strictCacheTimeInMinutes: new FormControl() @@ -113,9 +115,7 @@ export class ViaApiComponent implements OnInit, OnChanges { this.editorOptions.enableSort = false this.editorOptions.enableTransform = false - this.transforamtionForm = this.formBuilder.group({ - transformContent: new FormControl({}, Validators.required) - }) + this.transformationSpecForm = new FormControl({}, Validators.required) this.paramsFormArray.valueChanges.subscribe((params: any) => { if (!this.apiUrlEdited) { @@ -219,8 +219,8 @@ export class ViaApiComponent implements OnInit, OnChanges { this.patchFormData(responce) }) } else { - const transformContent = _.get(this.providerConfiguration, 'transformContentViaApi') - this.transforamtionForm.controls.transformContent.patchValue(transformContent) + const transformContent = _.get(this.providerConfiguration, this.transformationType) + this.transformationSpecForm.patchValue(transformContent) } } @@ -268,8 +268,8 @@ export class ViaApiComponent implements OnInit, OnChanges { this.authenticationFormGroup.controls.rawData.patchValue(authPayload) } - const transformContent = _.get(configurationDetails, 'transformContentViaApi', _.get(this.providerConfiguration, 'transformContentViaApi')) - this.transforamtionForm.controls.transformContent.patchValue(transformContent) + const transformContent = _.get(configurationDetails, this.transformationType, _.get(this.providerConfiguration, this.transformationType)) + this.transformationSpecForm.patchValue(transformContent) } @@ -320,6 +320,24 @@ export class ViaApiComponent implements OnInit, OnChanges { this.servicesFormGroup.controls.strictCacheTimeInMinutes.updateValueAndValidity() } + get getUpdateBtnText(): string { + let btnText = '' + if (this.transformationType === 'transformContentViaApi') { + if (this.providerConfiguration.trasformContentViaApi) { + btnText = 'Update Transform Content' + } else { + btnText = 'Save Transform Content' + } + } else if (this.transformationType === 'transformProgressViaApi') { + if (this.providerConfiguration.transformProgressViaApi) { + btnText = 'Update Transform Progress' + } else { + btnText = 'Save Transform Progress' + } + } + return btnText + } + configure() { this.configured = true if (this.servicesFormGroup.valid && this.viaApiFormGroup.valid && this.transformationsUpdated) { @@ -361,7 +379,7 @@ export class ViaApiComponent implements OnInit, OnChanges { } else { this.servicesFormGroup.markAllAsTouched() this.viaApiFormGroup.markAllAsTouched() - this.transforamtionForm.markAllAsTouched() + this.transformationSpecForm.markAsTouched() if (!this.transformationsUpdated) { const message = 'Please update transform content' this.showSnackBar(message) @@ -391,11 +409,11 @@ export class ViaApiComponent implements OnInit, OnChanges { requestPayload: { requestMap: isFormData ? this.generateObjectFromForm(this.bodyFormGroup.value.tableListFormArray) : this.bodyFormGroup.value.rawData, headerMap: this.generateObjectFromForm(this.headersFormGroup.value.tableListFormArray), - urlMap: this.generateObjectFromForm(this.paramsFormGroup.value.tableListFormArray, true), - strictCache: serviceDetails.strictCache, - strictCacheTimeInMinutes: serviceDetails.strictCacheTimeInMinutes + urlMap: this.generateObjectFromForm(this.paramsFormGroup.value.tableListFormArray, true) }, - authPayload: this.authenticationFormGroup.value.rawData + authPayload: this.authenticationFormGroup.value.rawData, + strictCache: serviceDetails.strictCache, + strictCacheTimeInMinutes: serviceDetails.strictCacheTimeInMinutes } return formBody } @@ -436,10 +454,10 @@ export class ViaApiComponent implements OnInit, OnChanges { upDateTransforamtionDetails() { this.providerDetails['data']['isActive'] = true - const hasTransformationAlready = this.providerDetails['transformContentViaApi'] ? true : false - this.transforamtionForm.markAllAsTouched() - if (this.transforamtionForm.valid) { - this.providerDetails['transformContentViaApi'] = this.transforamtionForm.controls.transformContent.value + const hasTransformationAlready = this.providerDetails[this.transformationType] ? true : false + this.transformationSpecForm.markAsTouched() + if (this.transformationSpecForm.valid) { + this.providerDetails[this.transformationType] = this.transformationSpecForm.value this.marketPlaceSvc.updateProvider(this.providerDetails).subscribe({ next: (responce: any) => { if (responce) { From 7793eaebef4497249212ab4bbf393f32f96a2737 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Fri, 17 Jan 2025 12:26:44 +0530 Subject: [PATCH 08/39] adding optionala check --- .../components/via-api/via-api.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html index 18af17ae..ce9a1ae3 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html @@ -172,9 +172,9 @@
- + [matTooltip]="availableHeadrsList?.length ? null : 'Please upload file'"> + {{header}} @@ -188,7 +188,7 @@ : - {{transFormControl.lable}} + {{transFormControl?.lable}}
From e63824b60121aa9cbfebcf80a12042e83f958e94 Mon Sep 17 00:00:00 2001 From: Venkat Kandagaddala Date: Fri, 17 Jan 2025 16:28:11 +0530 Subject: [PATCH 09/39] KB-8139 --- .../bulk-upload/bulk-upload.component.html | 22 +++++++++++-------- .../bulk-upload/bulk-upload.component.scss | 6 +++++ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html index 0d17a8a2..1135ed45 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.html @@ -64,37 +64,41 @@ {{ list?.status !== 'SUCCESSFUL' ? 'Download error log' : 'Download file' }}
-
-
+
+
Name
{{ list?.fileName }}
-
+
Status
{{ list?.status }}
-
+
Failed Records
{{ list?.failedRecordsCount }}
-
+
Success Records
{{ list?.successfulRecordsCount }}
-
-
+
+
Total Records
{{ list?.totalRecords }}
-
+
Initiated On
{{ list?.dateCreatedOn | date: 'dd MMM yyyy h:mm a' }}
-
+
Completed On
{{ list?.dateUpdatedOn | date: 'dd MMM yyyy h:mm a' }}
+
+
Uploaded By
+
{{ list?.userDetails?.firstName }}
+
diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss index 2f88c1c8..99ea1b42 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/bulk-upload/bulk-upload.component.scss @@ -15,6 +15,7 @@ line-height: 18px; color: rgba($color: #000000, $alpha: 0.88); word-break: break-all; + width: 95%; } .outline-button { @@ -76,6 +77,11 @@ } } +.box { + flex: 1 1 calc(25% - 10px); + box-sizing: border-box; +} + @media screen and (max-width: 641px) { ::ng-deep .common-modal, ::ng-deep .progress-modal { max-width: 90vw !important; From abb880d84d80384efc4a8be13951179035b4f300 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Fri, 17 Jan 2025 16:40:11 +0530 Subject: [PATCH 10/39] fixing KB-8117: Allignement is not proper and Progress spelling is wrong --- .../content-upload/content-upload.component.html | 2 +- .../help-center-guide.component.html | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) 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}}
+
+
From ee5952407f8bc2d76b5f1adc27c622c742dc9003 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Fri, 17 Jan 2025 16:41:16 +0530 Subject: [PATCH 11/39] fixing KB-8088: If user wants to change the options in the drop down, there is no way to change the options in the drop down --- .../components/transformations/transformations.component.html | 3 +++ 1 file changed, 3 insertions(+) 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 + : From 08b0779b2686b69797e07fae89c4fa5787535eb6 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Fri, 17 Jan 2025 16:42:09 +0530 Subject: [PATCH 12/39] fixing KB-8117: Progress spelling is wrong --- .../components/transformations/transformations.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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' From cac36b2a1e67f4f0f96e6d7bb57cbfa1100c3214 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Fri, 17 Jan 2025 16:46:50 +0530 Subject: [PATCH 13/39] =?UTF-8?q?fixing=20KB-8132:=20f=20user=20enter=20th?= =?UTF-8?q?e=20Space=20while=20entering=20the=20API=20its=20Accepting,=20f?= =?UTF-8?q?ixing=20KB-8134:=20Once=20user=20refresh=20the=20Application=20?= =?UTF-8?q?its=20displaying=20the=20old=20data,=20KB-8047:=20If=20the=20us?= =?UTF-8?q?er=20doesn=E2=80=99t=20enter=20the=20Authentication=20getting?= =?UTF-8?q?=20the=20error=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/via-api/via-api.component.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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) } } From 16d820e7d3968c1ea3996623ca545a4fa06c86c1 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Sat, 18 Jan 2025 15:49:00 +0530 Subject: [PATCH 14/39] fixing website url error message --- .../content-upload/content-upload.component.html | 14 +++++++++----- .../content-upload/content-upload.component.ts | 1 + .../provider-details/provider-details.component.ts | 10 ++++++++-- .../components/via-api/via-api.component.html | 3 ++- 4 files changed, 20 insertions(+), 8 deletions(-) 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 579738a7..4815d82d 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 @@ -22,7 +22,8 @@
- + Via CSV @@ -33,7 +34,8 @@ - + Via API @@ -48,7 +50,8 @@
- + Via CSV @@ -64,7 +67,8 @@
- + Via CSV @@ -84,7 +88,7 @@ - +
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts index 28985831..3ace8050 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/content-upload/content-upload.component.ts @@ -72,6 +72,7 @@ export class ContentUploadComponent implements OnInit, OnChanges { delayTabLoad = true viaApiTabIndex = 0 + openedTab = '' //#endregion //#region (constructor: contains Intialization of TransforamtionControls from routes data) diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts index 552fb128..8066d4f3 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.ts @@ -337,7 +337,10 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { }, error: (error: HttpErrorResponse) => { this.loaderService.changeLoad.next(false) - const errmsg = _.get(error, 'error.params.errMsg', 'Something went worng, please try again later') + let errmsg = _.get(error, 'error.params.errMsg', 'Something went worng, please try again later') + if (errmsg.includes('Validation error(s): \n$.websiteUrl:')) { + errmsg = 'Please provide a valid URL for the website' + } this.showSnackBar(errmsg) }, }) @@ -376,7 +379,10 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { }, error: (error: HttpErrorResponse) => { this.loaderService.changeLoad.next(false) - const errmsg = _.get(error, 'error.params.errMsg', 'Something went worng, please try again later') + let errmsg = _.get(error, 'error.params.errMsg', 'Something went worng, please try again later') + if (errmsg.includes('Validation error(s): \n$.websiteUrl:')) { + errmsg = 'Please provide a valid URL for the website' + } this.showSnackBar(errmsg) }, }) diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html index ce9a1ae3..7f78ec72 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html @@ -158,7 +158,8 @@
- Transform {{transformationType === 'trasformContentJson' ? 'Content' : 'Progress'}} + Transform {{transformationType === 'transformContentViaApi' ? 'Content' : + 'Progress'}}
From 65cacc99c08104e10786e99cb2e4d6ed97199ee4 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Mon, 20 Jan 2025 18:55:56 +0530 Subject: [PATCH 15/39] =?UTF-8?q?fixing=20KB-8039:-=20If=20user=20doesn?= =?UTF-8?q?=E2=80=99t=20enter=20the=20Transform=20content=E2=80=9D=20and?= =?UTF-8?q?=20clickng=20on=20save/Update=20transform=20button=20its=20succ?= =?UTF-8?q?efully=20updating?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../transformations.component.html | 3 +- .../transformations.component.ts | 17 ++++-- .../components/via-api/via-api.component.html | 5 +- .../components/via-api/via-api.component.ts | 53 +++++++++++-------- 4 files changed, 49 insertions(+), 29 deletions(-) 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 6abcd929..32c5b57d 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 @@ -92,7 +92,8 @@ - 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 548b603d..d4d96c79 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 @@ -9,7 +9,7 @@ import { ConformationPopupComponent } from '../../dialogs/conformation-popup/con import { HttpErrorResponse } from '@angular/common/http' import * as XLSX from 'xlsx' import { environment } from '../../../../../../../../../../../src/environments/environment' -import { JsonEditorOptions } from 'ang-jsoneditor' +import { JsonEditorComponent, JsonEditorOptions } from 'ang-jsoneditor' @Component({ selector: 'ws-app-transformations', @@ -21,6 +21,7 @@ export class TransformationsComponent implements OnInit, OnChanges { //#region (global varialbles) //#region (view chaild, input and output) @ViewChild('fileInput', { static: false }) fileInput!: ElementRef + @ViewChild('jsonEditor') jsonEditor: JsonEditorComponent | undefined @Input() providerDetails?: any @Input() transformationType = '' @@ -203,8 +204,18 @@ export class TransformationsComponent implements OnInit, OnChanges { const hasTransformationAlready = this.providerDetalsBeforUpdate[this.transformationType] ? true : false this.transforamtionForm.markAllAsTouched() this.transformationSpecForm.markAsTouched() + let isValidJson = false + if (this.transforamtionType === 'viaSpec') { + try { + const enteredJson = this.jsonEditor!.get() + isValidJson = JSON.stringify(enteredJson) !== '{}' ? true : false + } catch (err) { + isValidJson = false + } + } if ((this.transforamtionType === 'viaForm' && this.transforamtionForm.valid) || - (this.transforamtionType === 'viaSpec' && this.transformationSpecForm.valid && this.transformationSpecForm.value !== '{}')) { + (this.transforamtionType === 'viaSpec' && this.transformationSpecForm.valid && + JSON.stringify(this.transformationSpecForm.value) !== '{}' && isValidJson)) { if (this.transformationType !== 'certificateTemplateUrl') { if (this.transforamtionType === 'viaForm') { const trasformContentSpec: any = {} // contains maped transform spec for db @@ -249,7 +260,7 @@ export class TransformationsComponent implements OnInit, OnChanges { }) } else { - const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide spec json' + const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide valid spec json' this.showSnackBar(message) } } diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html index 7f78ec72..07033fd5 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html @@ -196,8 +196,9 @@ - +
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 946a6d62..2d53b2c4 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 @@ -1,11 +1,11 @@ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core' +import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core' import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms' import { MarketplaceService } from '../../services/marketplace.service' import { MatSnackBar } from '@angular/material/snack-bar' import * as _ from 'lodash' import { HttpErrorResponse } from '@angular/common/http' import { ActivatedRoute } from '@angular/router' -import { JsonEditorOptions } from 'ang-jsoneditor' +import { JsonEditorComponent, JsonEditorOptions } from 'ang-jsoneditor' @Component({ selector: 'ws-app-via-api', @@ -14,6 +14,7 @@ import { JsonEditorOptions } from 'ang-jsoneditor' }) export class ViaApiComponent implements OnInit, OnChanges { //#region (global varialbles) + @ViewChild('jsonEditor') jsonEditor: JsonEditorComponent | undefined //#region (view chaild, input and output) @Input() providerDetails?: any @Input() viaApiTabIndex = 0 @@ -460,28 +461,34 @@ export class ViaApiComponent implements OnInit, OnChanges { this.providerDetails['data']['isActive'] = true const hasTransformationAlready = this.providerDetails[this.transformationType] ? true : false this.transformationSpecForm.markAsTouched() - if (this.transformationSpecForm.valid) { - this.providerDetails[this.transformationType] = this.transformationSpecForm.value - this.marketPlaceSvc.updateProvider(this.providerDetails).subscribe({ - next: (responce: any) => { - if (responce) { - setTimeout(() => { - let successMsg = 'Saved Successfully' - successMsg = hasTransformationAlready ? 'Transform Content updated successfully.' : 'Transform Content saved successfully.' - this.showSnackBar(successMsg) - this.transformationsUpdated = true - this.loadProviderDetails.emit(true) - }, 1000) - } - }, - error: (error: HttpErrorResponse) => { - const errmsg = _.get(error, 'error.params.errMsg', 'Something went worng, please try again later') - this.showSnackBar(errmsg) - }, - }) + try { + this.jsonEditor!.get() + if (this.transformationSpecForm.valid && JSON.stringify(this.transformationSpecForm.value) !== '{}') { + this.providerDetails[this.transformationType] = this.transformationSpecForm.value + this.marketPlaceSvc.updateProvider(this.providerDetails).subscribe({ + next: (responce: any) => { + if (responce) { + setTimeout(() => { + let successMsg = 'Saved Successfully' + successMsg = hasTransformationAlready ? 'Transform Content updated successfully.' : 'Transform Content saved successfully.' + this.showSnackBar(successMsg) + this.transformationsUpdated = true + this.loadProviderDetails.emit(true) + }, 1000) + } + }, + error: (error: HttpErrorResponse) => { + const errmsg = _.get(error, 'error.params.errMsg', 'Something went worng, please try again later') + this.showSnackBar(errmsg) + }, + }) - } else { - const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide spec json' + } else { + const message = this.transforamtionType === 'viaForm' ? 'Please provide all mandatory fields' : 'Please provide valid spec json' + this.showSnackBar(message) + } + } catch (err) { + const message = 'Please provied valid valid spec json' this.showSnackBar(message) } } From 191a650ee8a4f3c839e372997a66fd1c7e358770 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Mon, 20 Jan 2025 18:58:04 +0530 Subject: [PATCH 16/39] =?UTF-8?q?fixing=20KB-8039:-=20If=20user=20doesn?= =?UTF-8?q?=E2=80=99t=20enter=20the=20Transform=20content=E2=80=9D=20and?= =?UTF-8?q?=20clickng=20on=20save/Update=20transform=20button=20its=20succ?= =?UTF-8?q?efully=20updating?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/via-api/via-api.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2d53b2c4..c7deeb1d 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 @@ -488,7 +488,7 @@ export class ViaApiComponent implements OnInit, OnChanges { this.showSnackBar(message) } } catch (err) { - const message = 'Please provied valid valid spec json' + const message = 'Please provied valid spec json' this.showSnackBar(message) } } From 3b0b9e2486ad9902bd0a8b283e0af60e6b07e657 Mon Sep 17 00:00:00 2001 From: Afzal84 Date: Tue, 21 Jan 2025 13:30:49 +0530 Subject: [PATCH 17/39] custom search button enhance --- .../ui-admin-user-table.component.html | 17 +++++++++++++---- .../ui-admin-user-table.component.scss | 8 ++++++++ .../user-list/ui-admin-user-table.component.ts | 17 ++++++++++------- 3 files changed, 31 insertions(+), 11 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html index 272efab8..e3c7bfa9 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html @@ -4,10 +4,19 @@
-
- search - +
+
+ search + +
+
+ +
diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss index 4357cb68..8988a722 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss @@ -702,4 +702,12 @@ $title-line-count: 2; font-family: "Lato-Regular", sans-serif; font-weight: 700; font-size: 14px; +} +.cstm-height-width { + height: 38px; +} +.disabled-cls { + opacity: 0.6; + pointer-events: none; + cursor: not-allowed; } \ No newline at end of file diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.ts b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.ts index fc366995..0ca83251 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.ts +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.ts @@ -68,6 +68,8 @@ export class UIAdminUserTableComponent implements OnInit, AfterViewInit, OnChang startIndex = 0 lastIndex = 20 searchText: string = '' + searchValue: string = '' + moreThanTwoChar = false constructor( private router: Router, public dialog: MatDialog, private activatedRoute: ActivatedRoute, @@ -135,12 +137,13 @@ export class UIAdminUserTableComponent implements OnInit, AfterViewInit, OnChang applyFilter(filterValue: any) { - if (filterValue) { - let fValue = filterValue.trim() - fValue = filterValue.toLowerCase() - this.dataSource.filter = fValue + if (filterValue.length === 0) { + this.onSearchEnter('') + } + if (filterValue.length > 2) { + this.moreThanTwoChar = true } else { - this.dataSource.filter = '' + this.moreThanTwoChar = false } } @@ -310,8 +313,8 @@ export class UIAdminUserTableComponent implements OnInit, AfterViewInit, OnChang } onSearchEnter(event: any) { - this.searchText = event.target.value - this.searchByEnterKey.emit(event.target.value) + this.searchText = event + this.searchByEnterKey.emit(event) } downloadUsersReport(value: string) { From a0f7ac58092597d8a6c4c39947b517f68b161549 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Wed, 22 Jan 2025 17:15:23 +0530 Subject: [PATCH 18/39] fixing tabs change issue in cios --- .../content-upload/content-upload.component.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) 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 4815d82d..d0761dfc 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 @@ -34,8 +34,7 @@ - + Via API @@ -50,8 +49,7 @@
- + Via CSV @@ -67,8 +65,7 @@
- + Via CSV From 1cc410ebd19b645b67f62235e923e33719a3df41 Mon Sep 17 00:00:00 2001 From: Afzal84 Date: Fri, 24 Jan 2025 17:15:49 +0530 Subject: [PATCH 19/39] custom button Implementation --- .../directory-table.component.html | 10 +++++++++- .../directory-table.component.scss | 5 +++++ .../directory-list/directory-table.component.ts | 16 +++++++++++++++- .../sector-list-view.component.html | 10 +++++++++- .../sector-list-view.component.ts | 2 ++ 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html index eae9aa95..19180011 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html @@ -19,9 +19,17 @@
search + [(ngModel)]="searchValue" (keydown.enter)="onSearchEnter($event.target.value)" + placeholder="Search">
+
+ +
diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss index 7afba4d0..a6ceb55b 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss @@ -734,4 +734,9 @@ $title-line-count: 2; ::ng-deep .mat-column-mdo { width: 450px; flex: none; +} +.disabled-cls { + opacity: 0.6; + pointer-events: none; + cursor: not-allowed; } \ No newline at end of file diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts index a203298f..732a0177 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.ts @@ -49,6 +49,8 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang showNewNoContent = false openCreateNavBar = false openMode = '' + searchValue: string = '' + moreThanTwoChar = false rowData: any dropdownList: { statesList: any[], @@ -120,8 +122,20 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang } ngAfterViewInit() { } + // applyFilter(filterValue: any) { + // this.filterSubject.next(filterValue) + // } applyFilter(filterValue: any) { - this.filterSubject.next(filterValue) + + if (filterValue.length === 0) { + this.onSearchEnter('') + this.filterSubject.next('') + } + if (filterValue.length > 2) { + this.moreThanTwoChar = true + } else { + this.moreThanTwoChar = false + } } onOrgPageChange(event: any) { diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html index 053feb63..7e4092fc 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html +++ b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html @@ -6,9 +6,17 @@
search -
+
+ +
diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.ts b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.ts index 50ab9c5f..0ab11b62 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.ts @@ -23,6 +23,8 @@ export class SectorListViewComponent implements OnInit { displayedColumns: any = [] dataSource!: any length!: number + searchValue: string = '' + moreThanTwoChar = false pageSize = sectorConstants.pageSize pageSizeOptions = sectorConstants.pageOptions cardMenu: any From 53e24beea54d1d75369ddca3a39aa82b7b0843c8 Mon Sep 17 00:00:00 2001 From: nitinraj-tarento Date: Fri, 24 Jan 2025 19:45:15 +0530 Subject: [PATCH 20/39] search box css fix --- .../directory-table.component.html | 17 +++++++++-------- .../directory-table.component.scss | 4 ++++ .../routes/directory/directory.component.scss | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html index 19180011..3dedeb78 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html @@ -15,21 +15,22 @@
-
+
search
+
+ +
-
- -
+ diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss index a6ceb55b..448daaee 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss @@ -739,4 +739,8 @@ $title-line-count: 2; opacity: 0.6; pointer-events: none; cursor: not-allowed; +} + +.search-btn-div { + margin-top: 6px; } \ No newline at end of file diff --git a/project/ws/app/src/lib/routes/home/routes/directory/directory.component.scss b/project/ws/app/src/lib/routes/home/routes/directory/directory.component.scss index e8215bf0..6dc8e1c3 100644 --- a/project/ws/app/src/lib/routes/home/routes/directory/directory.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/directory/directory.component.scss @@ -289,7 +289,7 @@ a:not([href]):not([tabindex]) { ::ng-deep.custom-btn { padding: 10px 16px !important; - margin: 10px 0 !important; + // margin: 10px 0 !important; line-height: 1; align-self: center; } From 001049a82e8d332292f58f7d4930574526b5e5ba Mon Sep 17 00:00:00 2001 From: vishnubansaltarento Date: Thu, 30 Jan 2025 16:40:47 +0530 Subject: [PATCH 21/39] update jest config for angular 16 --- jest.config.js | 24 ++++++++++++------------ package.json | 6 ++++-- project/ws/app/src/jest-setup.ts | 0 src/setup-jest.ts | 1 + 4 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 project/ws/app/src/jest-setup.ts create mode 100644 src/setup-jest.ts diff --git a/jest.config.js b/jest.config.js index cd98c2f3..56e2f71c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,17 +1,17 @@ module.exports = { - preset: 'ts-jest', + preset: 'jest-preset-angular', testEnvironment: 'jsdom', - transform: { - '^.+\\.tsx?$': 'ts-jest', + setupFilesAfterEnv: ['/src/setup-jest.ts'], + transformIgnorePatterns: [ + 'node_modules/(?!.*\\.mjs$)', + ], + moduleNameMapper: { + 'worker-loader!.*': '/test/mocks/workerMock.js', + 'pdfjs-dist/build/pdf.worker': '/test/mocks/workerMock.js', + "^src/environments/environment$": "/src/environments/environment.ts", }, - // moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'], - // transformIgnorePatterns: ['/node_modules/'], - // moduleNameMapper: { - // '^src/(.*)$': '/home/sujithsojan/Desktop/igot-jest/sunbird-cb-adminportal/src/$1', - // }, - // setupFiles: ['/home/sujithsojan/Desktop/igot-jest/sunbird-cb-adminportal/src/jest.setup.ts'], - coverageDirectory: './coverage', coverageReporters: ["clover", "json", "lcov", "text", "text-summary"], collectCoverage: true, - testResultsProcessor: "jest-sonar-reporter" -} + testResultsProcessor: "jest-sonar-reporter", + setupFiles: ['zone.js', ] +}; \ No newline at end of file diff --git a/package.json b/package.json index c9401425..0a0d3b34 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "start:spv-dev": "node --max_old_space_size=12288 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy/spv-dev-ip.proxy.json -o", "analyse": "webpack-bundle-analyzer ./dist/www/ng serve --proxy-config proxy/localhost.proxy.json -o/stats-es5.json", "test": "jest", - "test-coverage": "./node_modules/jest/bin/jest.js --clearCache && node --max_old_space_size=1024 ./node_modules/jest/bin/jest.js --silent --ci --collectCoverage=true --coverageReporters=lcov --detectOpenHandles --forceExit=true", + "test-coverage": "./node_modules/jest/bin/jest.js --clearCache && node --max_old_space_size=8000 ./node_modules/jest/bin/jest.js --silent --ci --collectCoverage=true --coverageReporters=lcov --detectOpenHandles --forceExit=true", "lint": "ng lint", "lint:fix": "ng lint --fix", "e2e": "ng e2e", @@ -27,6 +27,7 @@ }, "private": true, "dependencies": { + "@angular-builders/jest": "^19.0.0", "@angular/animations": "^16.2.12", "@angular/cdk": "^16.2.14", "@angular/common": "^16.2.12", @@ -61,7 +62,7 @@ "file-saver": "^2.0.2", "hammerjs": "^2.0.8", "husky": "^4.2.3", - "jest": "29.7.0", + "jest": "^29.7.0", "jest-preset-angular": "^14.2.4", "jquery": "^3.4.1", "jsoneditor": "^10.1.0", @@ -117,6 +118,7 @@ "jasmine-core": "~3.6.0", "jasmine-spec-reporter": "~5.0.0", "jest-sonar-reporter": "^2.0.0", + "jest-localstorage-mock": "^2.4.26", "karma": "~6.4.4", "karma-chrome-launcher": "~3.1.0", "karma-coverage-istanbul-reporter": "~3.0.2", diff --git a/project/ws/app/src/jest-setup.ts b/project/ws/app/src/jest-setup.ts new file mode 100644 index 00000000..e69de29b diff --git a/src/setup-jest.ts b/src/setup-jest.ts new file mode 100644 index 00000000..94faaa0f --- /dev/null +++ b/src/setup-jest.ts @@ -0,0 +1 @@ +import 'jest-preset-angular/setup-jest' \ No newline at end of file From ffc2f1f813eadcbaff8cfe9d14891273b19d6951 Mon Sep 17 00:00:00 2001 From: vishnubansaltarento Date: Thu, 30 Jan 2025 16:46:29 +0530 Subject: [PATCH 22/39] update for jest config for angular 16 --- project/ws/app/src/jest-setup.ts | 0 src/{jest.setup.ts => jest-setup.ts} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 project/ws/app/src/jest-setup.ts rename src/{jest.setup.ts => jest-setup.ts} (99%) diff --git a/project/ws/app/src/jest-setup.ts b/project/ws/app/src/jest-setup.ts deleted file mode 100644 index e69de29b..00000000 diff --git a/src/jest.setup.ts b/src/jest-setup.ts similarity index 99% rename from src/jest.setup.ts rename to src/jest-setup.ts index ba43bd9d..dc567780 100644 --- a/src/jest.setup.ts +++ b/src/jest-setup.ts @@ -14,4 +14,4 @@ Object.defineProperty(window, 'env', { KCMframeworkName: 'Framework 1', }, writable: true, -}) \ No newline at end of file +}) From 9999cf14f6dd9c4023ad786fbba9cb4f5bba96e6 Mon Sep 17 00:00:00 2001 From: mansurskTarento Date: Mon, 10 Feb 2025 19:46:43 +0530 Subject: [PATCH 23/39] removing builk upload from designations --- .../components/designations/designations.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html index e0b57a61..8b6549ba 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.html @@ -4,9 +4,9 @@
{{designationConfig.mainHeading}}
-
diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss index 745c4105..c3ffff35 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss +++ b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/import-designation/import-designation.component.scss @@ -34,7 +34,9 @@ .sinput { margin-top: 0; + /* stylelint-disable */ font: normal 14px Lato; + /* stylelint-enable */ font-weight: 400; width: 700px; border-radius: 9999px; @@ -85,7 +87,9 @@ color: #1b4ca1 !important; font-weight: 700; letter-spacing: 0.25px; + /* stylelint-disable */ font-family: 'Lato'; + /* stylelint-enable */ } .master-designations { diff --git a/project/ws/app/src/lib/routes/home/components/confirmation-box/confirmation-box.component.html b/project/ws/app/src/lib/routes/home/components/confirmation-box/confirmation-box.component.html index 47c2d7c3..efe18ffe 100644 --- a/project/ws/app/src/lib/routes/home/components/confirmation-box/confirmation-box.component.html +++ b/project/ws/app/src/lib/routes/home/components/confirmation-box/confirmation-box.component.html @@ -1,7 +1,7 @@
- + icon
@@ -39,7 +39,7 @@ - + icon
@@ -59,7 +59,7 @@ {{data?.subTitle}}
- + icon
diff --git a/project/ws/app/src/lib/routes/home/components/selected-designation-popup/selected-designation-popup.component.scss b/project/ws/app/src/lib/routes/home/components/selected-designation-popup/selected-designation-popup.component.scss index e6ac7fe6..465e336f 100644 --- a/project/ws/app/src/lib/routes/home/components/selected-designation-popup/selected-designation-popup.component.scss +++ b/project/ws/app/src/lib/routes/home/components/selected-designation-popup/selected-designation-popup.component.scss @@ -1,6 +1,8 @@ .designationHeader { + /* stylelint-disable */ font: 600 16px / 24px Montserrat; + /* stylelint-enable */ } .custom-user-card { width: 292px; @@ -9,7 +11,9 @@ height: 70px; display: flex; padding: 0 16px; + /* stylelint-disable */ width: 230px; + /* stylelint-enable */ white-space: nowrap; position: relative; p { diff --git a/project/ws/app/src/lib/routes/home/routes/request/request-copy-details/request-copy-details.component.html b/project/ws/app/src/lib/routes/home/routes/request/request-copy-details/request-copy-details.component.html index 336b8465..8d6c48c6 100644 --- a/project/ws/app/src/lib/routes/home/routes/request/request-copy-details/request-copy-details.component.html +++ b/project/ws/app/src/lib/routes/home/routes/request/request-copy-details/request-copy-details.component.html @@ -174,7 +174,7 @@
- +
diff --git a/project/ws/app/src/lib/routes/search/components/item-tile/item-tile.component.ts b/project/ws/app/src/lib/routes/search/components/item-tile/item-tile.component.ts index 7ccac407..14543a00 100644 --- a/project/ws/app/src/lib/routes/search/components/item-tile/item-tile.component.ts +++ b/project/ws/app/src/lib/routes/search/components/item-tile/item-tile.component.ts @@ -17,7 +17,7 @@ export class ItemTileComponent implements OnInit { return typeof input === 'string' } goToView() { - try { + try { //NOSONAR this.route.navigate( [``], { diff --git a/project/ws/app/src/lib/routes/search/routes/knowledge/knowledge.component.ts b/project/ws/app/src/lib/routes/search/routes/knowledge/knowledge.component.ts index d6429973..6b940db3 100644 --- a/project/ws/app/src/lib/routes/search/routes/knowledge/knowledge.component.ts +++ b/project/ws/app/src/lib/routes/search/routes/knowledge/knowledge.component.ts @@ -159,7 +159,7 @@ export class KnowledgeComponent implements OnInit, OnDestroy { }) } sortOrder(type: string) { - try { + try { //NOSONAR this.router.navigate([], { queryParams: { sort: type }, queryParamsHandling: 'merge', diff --git a/project/ws/app/src/lib/routes/search/routes/learning/learning.component.ts b/project/ws/app/src/lib/routes/search/routes/learning/learning.component.ts index ce5e55e5..5bd533d0 100644 --- a/project/ws/app/src/lib/routes/search/routes/learning/learning.component.ts +++ b/project/ws/app/src/lib/routes/search/routes/learning/learning.component.ts @@ -450,7 +450,7 @@ export class LearningComponent implements OnInit, OnDestroy { return item.identifier } sortOrder(type: string) { - try { + try { //NOSONAR this.router.navigate([], { queryParams: { sort: type }, queryParamsHandling: 'merge', @@ -479,7 +479,7 @@ export class LearningComponent implements OnInit, OnDestroy { } searchLanguage(type: string) { - try { + try { //NOSONAR this.router.navigate([], { queryParams: { lang: type }, queryParamsHandling: 'merge', diff --git a/project/ws/app/src/lib/routes/search/routes/social/social.component.ts b/project/ws/app/src/lib/routes/search/routes/social/social.component.ts index 8b38c9b7..423c8228 100644 --- a/project/ws/app/src/lib/routes/search/routes/social/social.component.ts +++ b/project/ws/app/src/lib/routes/search/routes/social/social.component.ts @@ -204,7 +204,7 @@ export class SocialComponent implements OnInit, OnDestroy { return item.identifier } toggleBestResults() { - try { + try { //NOSONAR this.query = !this.query this.searchRequestObject.postKind = this.query ? 'Query' : 'Blog' this.searchRequestObject.pageNo = 0 @@ -219,7 +219,7 @@ export class SocialComponent implements OnInit, OnDestroy { } sortOrder(type: string) { - try { + try { //NOSONAR this.router.navigate([], { queryParams: { sort: type }, queryParamsHandling: 'merge', From e59034a813c0d7e46d4d772194be06136dfd310f Mon Sep 17 00:00:00 2001 From: nitinraj-tarento Date: Tue, 18 Feb 2025 15:32:06 +0530 Subject: [PATCH 26/39] searchbox ui fix --- .../directory-table.component.html | 6 ++-- .../directory-table.component.scss | 11 +++---- .../ui-admin-user-table.component.html | 15 +++++----- .../ui-admin-user-table.component.scss | 11 +++---- .../event-list-view.component.html | 17 ++++++----- .../event-list-view.component.scss | 29 ++++++++++++------- .../sector-list-view.component.html | 23 +++++++++------ .../sector-list-view.component.scss | 28 +++++++++++------- 8 files changed, 83 insertions(+), 57 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html index 3dedeb78..2e49fcfe 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html @@ -14,7 +14,7 @@
-
+
search @@ -22,10 +22,10 @@ [(ngModel)]="searchValue" (keydown.enter)="onSearchEnter($event.target.value)" placeholder="Search">
-
+
diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss index 448daaee..c92d809b 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss @@ -631,6 +631,7 @@ $title-line-count: 2; .search { display: flex; flex: 1; + margin-bottom:16px; } .lsearch { @@ -653,12 +654,12 @@ $title-line-count: 2; } .sinput { - width: 50%; + width: 400px; border-radius: 9999px; border: 1px solid #d5d0d0; - padding: 12px 16px; - margin-bottom: 10px; - margin-top: 10px; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; min-height: 20px; .material-icons { @@ -669,7 +670,7 @@ $title-line-count: 2; input { border: 0 !important; - width: 75%; + // width: 75%; outline: none !important; } } diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html index 6c15d3de..7dffaeff 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html @@ -13,7 +13,7 @@
@@ -21,35 +21,36 @@
-
-
diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss index 8988a722..209c0397 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss @@ -636,17 +636,19 @@ $title-line-count: 2; .rsearch { display: flex; flex: 1 1 auto; + margin-bottom: 12px; } .w-100{ width: 100%; } .sinput { - width: 300px; - border-radius: 4px; + width: 400px; + border-radius: 9999px; border: 1px solid #d5d0d0; - padding: 4px 8px 8px; - margin-bottom: 20px; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; min-height: 20px; .material-icons { @@ -657,7 +659,6 @@ $title-line-count: 2; input { border: 0 !important; - width: 84%; outline: none !important; } } diff --git a/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.html b/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.html index 00aad00c..7c3a181e 100644 --- a/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.html +++ b/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.html @@ -3,17 +3,18 @@
-
-
-
- search - +
+
+
+ search +
-
-
diff --git a/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss b/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss index b18312e5..3de3490e 100644 --- a/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss @@ -672,21 +672,31 @@ $title-line-count: 2; display: flex; position: relative; flex: 1 1 auto; + margin-bottom: 12px; } .sinput { - width: 29%; - border-radius: 4px; +width: 400px; + border-radius: 9999px; border: 1px solid #d5d0d0; - padding: 9px 9px 9px 35px; - margin-bottom: 20px; - margin-top: 10px; - /* stylelint-disable */ - font: normal 14px Lato; - /* stylelint-enable */ - font-weight: 400; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; + min-height: 20px; + + .material-icons { + vertical-align: middle; + font-size: 20px; + margin-right: 7px; + } + + input { + border: 0 !important; + outline: none !important; + } } + .searchText { display: flex; flex-direction: row-reverse; @@ -758,7 +768,6 @@ mat-header-row { .create-btn { width: 130px; - background: #0075B7 !important; color: white !important; /* stylelint-disable */ font-family: 'Lato'; diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html index 7e4092fc..07bf7e3f 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html +++ b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html @@ -2,25 +2,30 @@
-
-
-
- search - +
+ + +
+ search + + (input)="applyFilter($event.target.value)" placeholder="Search">
-
-
diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss index b18312e5..87bd6967 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss @@ -672,19 +672,28 @@ $title-line-count: 2; display: flex; position: relative; flex: 1 1 auto; + margin-bottom: 12px; } .sinput { - width: 29%; - border-radius: 4px; +width: 400px; + border-radius: 9999px; border: 1px solid #d5d0d0; - padding: 9px 9px 9px 35px; - margin-bottom: 20px; - margin-top: 10px; - /* stylelint-disable */ - font: normal 14px Lato; - /* stylelint-enable */ - font-weight: 400; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; + min-height: 20px; + + .material-icons { + vertical-align: middle; + font-size: 20px; + margin-right: 7px; + } + + input { + border: 0 !important; + outline: none !important; + } } .searchText { @@ -758,7 +767,6 @@ mat-header-row { .create-btn { width: 130px; - background: #0075B7 !important; color: white !important; /* stylelint-disable */ font-family: 'Lato'; From 99f256f20faecddac36a1d4e0e19b55fcdc4a9e5 Mon Sep 17 00:00:00 2001 From: nitinraj-tarento Date: Tue, 18 Feb 2025 16:59:58 +0530 Subject: [PATCH 27/39] search box ui fix --- .../directory-table.component.html | 2 +- .../directory-table.component.scss | 6 ++--- .../courses-table.component.html | 7 +++-- .../courses-table.component.scss | 27 ++++++++++++------- .../market-place-dashboard.component.html | 2 +- .../home/routes/survey/survey.component.html | 2 +- .../home/routes/survey/survey.component.scss | 21 +++++++-------- 7 files changed, 39 insertions(+), 28 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html index 2e49fcfe..ca813e44 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.html @@ -25,7 +25,7 @@
diff --git a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss index c92d809b..a86813df 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/directory-list/directory-table.component.scss @@ -660,12 +660,12 @@ $title-line-count: 2; padding: 8px 16px; box-sizing: border-box; // margin-bottom: 10px; - min-height: 20px; + height: 42px; .material-icons { - vertical-align: bottom; + vertical-align: middle; font-size: 20px; - margin-right: 7px; + margin-right: 4px; } input { diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.html index 12f1fb1d..1ec0b5b9 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.html @@ -3,8 +3,11 @@
- search - +
+ search + +
+
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss index 16eae323..1f0a709a 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss @@ -5,16 +5,25 @@ } .sinput { - width: 315px; - border-radius: 4px; + width: 400px; + border-radius: 9999px; border: 1px solid #d5d0d0; - padding: 9px 9px 9px 35px; - margin-bottom: 0px; - margin-top: 0; - /* stylelint-enable */ - font: normal 14px Lato; - /* stylelint-disable */ - font-weight: 400; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; + min-height: 20px; + + .material-icons { + vertical-align: middle; + font-size: 20px; + margin-right: 4px; + } + + input { + border: 0 !important; + // width: 75%; + outline: none !important; + } } .search-icon { diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/market-place-dashboard/market-place-dashboard.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/market-place-dashboard/market-place-dashboard.component.html index 330e28c3..8b3d2f89 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/market-place-dashboard/market-place-dashboard.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/market-place-dashboard/market-place-dashboard.component.html @@ -4,7 +4,7 @@
Marketplace Provider
-
diff --git a/project/ws/app/src/lib/routes/home/routes/survey/survey.component.html b/project/ws/app/src/lib/routes/home/routes/survey/survey.component.html index f97ad96b..7eb183ec 100644 --- a/project/ws/app/src/lib/routes/home/routes/survey/survey.component.html +++ b/project/ws/app/src/lib/routes/home/routes/survey/survey.component.html @@ -7,7 +7,7 @@
-
diff --git a/project/ws/app/src/lib/routes/home/routes/survey/survey.component.scss b/project/ws/app/src/lib/routes/home/routes/survey/survey.component.scss index e31d688c..4aac5213 100644 --- a/project/ws/app/src/lib/routes/home/routes/survey/survey.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/survey/survey.component.scss @@ -1,6 +1,5 @@ .create-btn { width: 130px; - background: #0075B7 !important; color: white !important; /* stylelint-disable */ font-family: 'Lato'; @@ -9,13 +8,13 @@ font-size: 14px; } -.theme-igot.day-mode .mat-button .create-btn { - width: 107px; - background: #0075B7 !important; - color: white !important; - /* stylelint-disable */ - font-family: 'Lato'; - /* stylelint-enable */ - font-weight: 700; - font-size: 14px; -} \ No newline at end of file +// .theme-igot.day-mode .mat-button .create-btn { +// width: 107px; +// background: #0075B7 !important; +// color: white !important; +// /* stylelint-disable */ +// font-family: 'Lato'; +// /* stylelint-enable */ +// font-weight: 700; +// font-size: 14px; +// } \ No newline at end of file From c90588178c0159382a216d38549825b661467a7e Mon Sep 17 00:00:00 2001 From: Afzal84 Date: Tue, 18 Feb 2025 18:49:23 +0530 Subject: [PATCH 28/39] Custom button fix --- .../roles-access/roles-access.component.html | 5 +++-- .../roles-access/roles-access.component.ts | 12 ++++++++++++ .../roles-access/roles-access.component.html | 7 ++++--- .../roles-access/roles-access.component.ts | 18 +++++++++++++++--- .../sector-list-view.component.html | 15 +++++++++------ 5 files changed, 43 insertions(+), 14 deletions(-) diff --git a/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.html b/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.html index ad4e08ff..2051fb6e 100644 --- a/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.html +++ b/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.html @@ -1,6 +1,7 @@ - + diff --git a/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.ts index a0e9b08d..6bd9c754 100644 --- a/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.ts +++ b/project/ws/app/src/lib/routes/access/routes/roles-access/roles-access.component.ts @@ -22,6 +22,7 @@ export class RolesAccessComponent implements OnInit, AfterViewInit { currentDept: any = '' rolesContentObject: any = [] individualRoleCount = true + filteredRoles: any = [] @Output() clickedDepartment = new EventEmitter() constructor( private activatedRoute: ActivatedRoute, @@ -93,6 +94,7 @@ export class RolesAccessComponent implements OnInit, AfterViewInit { uniqueRoles.push({ role: allRoles[i], count: '0' }) } this.data = uniqueRoles + this.filteredRoles = [...this.data] }) // ol code // const usersData: any[] = [] @@ -123,6 +125,16 @@ export class RolesAccessComponent implements OnInit, AfterViewInit { // } // this.data = roleAndAccess } + onRoleSearch(searchQuery: string) { + if (searchQuery?.length) { + this.filteredRoles = this.data.filter((role: any) => + role?.role?.toLowerCase().includes(searchQuery?.toLowerCase()) + ) + } else { + this.filteredRoles = [...this.data] // Reset to full data when search is empty + } + } + fetchIndidualRoleData(rootOrgId: string, rolename: string) { this.usersService.getAllRoleUsers(rootOrgId, rolename).subscribe(data => { this.individualRoleCount = true diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html index 02a3580e..947a4129 100644 --- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html +++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.html @@ -11,8 +11,9 @@ - + @@ -22,4 +23,4 @@ -
+
\ No newline at end of file diff --git a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts index ea719864..a22c81e3 100644 --- a/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts +++ b/project/ws/app/src/lib/routes/home/routes/roles-access/roles-access.component.ts @@ -27,11 +27,12 @@ export class RolesAccessComponent implements OnInit { individualRoleCount = true userRoles: any = [] roleType: any = '' + filteredRoles: any = [] constructor(private router: Router, - private activeRoute: ActivatedRoute, - private usersService: UsersService, - private roleservice: RolesService + private activeRoute: ActivatedRoute, + private usersService: UsersService, + private roleservice: RolesService ) { this.getAllKongUsers() this.userRoles = _.get(this.activeRoute, 'snapshot.parent.data.configService.unMappedUser.roles') @@ -78,9 +79,20 @@ export class RolesAccessComponent implements OnInit { uniqueRoles.push({ role: allRoles[i], count: 0 }) } this.data = uniqueRoles + this.filteredRoles = [...this.data] // Ensure filteredRoles is initialized }) } + onRoleSearch(searchQuery: string) { + if (searchQuery?.length) { + this.filteredRoles = this.data?.filter((role: any) => + role?.role?.toLowerCase().includes(searchQuery?.toLowerCase()) + ) + } else { + this.filteredRoles = [...this.data] // Reset to full data when search is empty + } + } + fetchIndidualRoleData(rootOrgId: string, rolename: string) { this.usersService.getAllRoleUsers(rootOrgId, rolename).subscribe(data => { this.individualRoleCount = true diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html index 07bf7e3f..42b7c936 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html +++ b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.html @@ -6,19 +6,22 @@
- +
search - +
- + -->
From 38f2ab1bcce028328393d2593f2ae5309c3144f0 Mon Sep 17 00:00:00 2001 From: nitinraj-tarento Date: Tue, 18 Feb 2025 19:41:16 +0530 Subject: [PATCH 29/39] search box ui fix-2 --- .../ui-admin-table/user-list/ui-admin-user-table.component.scss | 2 +- .../events/event-list-view/event-list-view.component.scss | 2 +- .../components/courses-table/courses-table.component.scss | 2 +- .../sectors/sector-list-view/sector-list-view.component.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss index 209c0397..4caf8efb 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.scss @@ -649,7 +649,7 @@ $title-line-count: 2; padding: 8px 16px; box-sizing: border-box; // margin-bottom: 10px; - min-height: 20px; + height: 42px; .material-icons { vertical-align: bottom; diff --git a/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss b/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss index 3de3490e..c033c7a3 100644 --- a/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/events/event-list-view/event-list-view.component.scss @@ -682,7 +682,7 @@ width: 400px; padding: 8px 16px; box-sizing: border-box; // margin-bottom: 10px; - min-height: 20px; + height: 42px; .material-icons { vertical-align: middle; diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss index 1f0a709a..52c61a88 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/courses-table/courses-table.component.scss @@ -11,7 +11,7 @@ padding: 8px 16px; box-sizing: border-box; // margin-bottom: 10px; - min-height: 20px; + height: 42px; .material-icons { vertical-align: middle; diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss index 87bd6967..a246785e 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/sectors/sector-list-view/sector-list-view.component.scss @@ -682,7 +682,7 @@ width: 400px; padding: 8px 16px; box-sizing: border-box; // margin-bottom: 10px; - min-height: 20px; + height: 42px; .material-icons { vertical-align: middle; From 68171c332f698d2fbf216b7734e53778a0373e62 Mon Sep 17 00:00:00 2001 From: nitinraj-tarento Date: Tue, 18 Feb 2025 20:21:02 +0530 Subject: [PATCH 30/39] search box ui fix-2 --- .../ui-admin-table/user-list/ui-admin-user-table.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html index a8a64fe7..9d97e5ba 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html @@ -13,7 +13,7 @@
From 1e768234f13d5d86fe87b905694fcf38aa35c5e4 Mon Sep 17 00:00:00 2001 From: Afzal84 Date: Wed, 19 Feb 2025 00:26:17 +0530 Subject: [PATCH 31/39] survey search button CSS fix --- .../user-list/ui-admin-user-table.component.html | 2 +- .../ui-admin-table/user-list/ui-admin-user-table.component.ts | 1 + .../access/routes/roles-access/roles-access.component.html | 2 +- .../lib/routes/create-mdo/routes/users/users.component.html | 2 +- .../home/routes/roles-access/roles-access.component.html | 2 +- .../routes/home/routes/roles-users/roles-users.component.html | 3 ++- .../home/routes/survey/survey-list/survey-list.component.html | 3 ++- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html index 9d97e5ba..90724d72 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html +++ b/project/ws/app/src/lib/head/ui-admin-table/user-list/ui-admin-user-table.component.html @@ -10,7 +10,7 @@
-
+
@@ -463,8 +463,8 @@
-
-
-
- diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.scss b/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.scss index 147fbbcc..9665aace 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.scss @@ -18,12 +18,15 @@ .flex-child-element:first-child { margin-right: 20px; } +.cancle-btn { + border-radius: 20px; +} .create-btn { // width: 130px; - background: #0075B7 !important; + background: #1b4ca1 !important; color: white !important; /* stylelint-disable */ font-family: 'Lato'; @@ -110,8 +113,7 @@ input[type=number] { } .btn-success { - background-color: #0075B7!important; - border-radius: 4px; + border-radius: 20px; box-shadow: none; margin-right: 16px; @@ -269,7 +271,7 @@ input.mat-input-element { } &:focus { - border: 2px solid #0074b6; + border: 2px solid #1b4ca1; outline: none; } @@ -320,7 +322,7 @@ input.mat-input-element { .image-thumb { width: 50px; height: 50px; - border: 3px dotted #0075B7; + border: 3px dotted #1b4ca1; border-radius: 15px; position: relative; cursor: pointer; @@ -328,7 +330,7 @@ input.mat-input-element { .camera { display: flex; padding: 5px; - background: #0075B7 !important; + background: #1b4ca1 !important; border-radius: 15px; color: white; position: absolute; @@ -355,7 +357,7 @@ input.mat-input-element { .sectors-link { ::ng-deep.color-80 { - color: #0075B7 !important; + color: #1b4ca1 !important; } } From e50f920abe77653eb012d762f28b5b22654272ea Mon Sep 17 00:00:00 2001 From: nitinraj-tarento Date: Thu, 20 Feb 2025 16:14:38 +0530 Subject: [PATCH 38/39] download btn color fix on survey report page --- .../home/routes/general-reports/general-reports.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/ws/app/src/lib/routes/home/routes/general-reports/general-reports.component.scss b/project/ws/app/src/lib/routes/home/routes/general-reports/general-reports.component.scss index 986ef59a..73f9bd41 100644 --- a/project/ws/app/src/lib/routes/home/routes/general-reports/general-reports.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/general-reports/general-reports.component.scss @@ -8,7 +8,7 @@ text-align: left !important; span { text-decoration: underline !important; - color: #0075B7 !important; + color: #1b4ca1 !important; } } From fc124ab2eca5d2074a61802f7da62497b383e8c2 Mon Sep 17 00:00:00 2001 From: Afzal84 Date: Thu, 20 Feb 2025 17:21:21 +0530 Subject: [PATCH 39/39] survey input box css fix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 71ad35ec..fd3ddfa8 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "@babel/core": "7.22.0", "@babel/preset-env": "7.25.4", "@project-sunbird/telemetry-sdk": "0.0.26", - "@sunbird-cb/collection": "1.0.52-ang-13-16", + "@sunbird-cb/collection": "1.0.53-ang-13-16", "@sunbird-cb/rain-dashboards": "0.0.36-ang-13-16", "@sunbird-cb/resolver": "1.0.0-ang-13-16", "@sunbird-cb/taxonomy-editor": "0.0.0-ang-13-16",
Area Theme