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..fd3ddfa8 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", @@ -43,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.49-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", @@ -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/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts b/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts index ec7c7d53..1a60b66e 100644 --- a/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts +++ b/project/ws/app/src/lib/head/ui-admin-table/create-organisation/create-organisation.component.ts @@ -44,7 +44,6 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy { uploadedLogoResponse!: IUploadedLogoresponse organizationNameList: string[] = [] ORG_NAME_PATTERN = /^[a-zA-Z0-9 ().,@\-\$\/\\:\[\]!\s]*$/ - rootOrgId: any untilDestroyed$ = new Subject(); isMatcompleteOpened = false @@ -57,7 +56,7 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy { private snackBar: MatSnackBar, private createMDOService: CreateMDOService, private activatedRoute: ActivatedRoute, - private loaderService: LoaderService, + private loaderService: LoaderService ) { this.addOverflowHidden() @@ -218,8 +217,6 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy { } onSubmitCreateOrganization() { - const userProfile = _.get(this.activatedRoute, 'snapshot.parent.data.configService.userProfile') - this.rootOrgId = userProfile.rootOrgId let payload: any = { orgName: this.controls['organisationName']?.value || "", channel: this.controls['organisationName']?.value || "", @@ -230,10 +227,8 @@ export class CreateOrganisationComponent implements OnInit, OnDestroy { logo: this.uploadedLogoResponse?.qrcodepath || "", description: this.controls['description']?.value || "", parentMapId: "", - sbRootOrgId: this.rootOrgId - } - // if (this.heirarchyObject && this.heirarchyObject.sbRootOrgId) { + // if (this.heirarchyObject.sbRootOrgId) { // payload['sbRootOrgId'] = this.heirarchyObject.sbRootOrgId // } if (this.controls['category']?.value === 'state') { 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..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 @@ -14,14 +14,23 @@
-
-
+
+
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..0aba783f 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 { @@ -648,28 +649,30 @@ $title-line-count: 2; } .noContent { + /* stylelint-disable */ font: 700 14px 'Lato'; + /* stylelint-enable */ color: #000000de; } .sinput { - width: 50%; - border-radius: 9999px; + width: 400px; + border-radius: 20px; border: 1px solid #d5d0d0; - padding: 12px 16px; - margin-bottom: 10px; - margin-top: 10px; - min-height: 20px; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; + height: 42px; .material-icons { - vertical-align: bottom; + vertical-align: middle; font-size: 20px; - margin-right: 7px; + margin-right: 4px; } input { border: 0 !important; - width: 75%; + // width: 75%; outline: none !important; } } @@ -734,4 +737,13 @@ $title-line-count: 2; ::ng-deep .mat-column-mdo { width: 450px; flex: none; +} +.disabled-cls { + 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/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..5cad1eb5 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) { @@ -235,7 +249,11 @@ export class UIDirectoryTableComponent implements OnInit, AfterViewInit, OnChang } onSearchEnter(filterValue: any) { - this.searchByEnterKey.emit(filterValue) + if (filterValue === '') { + this.searchByEnterKey.emit('') + } else if (filterValue?.length > 2) { + this.searchByEnterKey.emit(filterValue) + } } buttonClickAction(event: any) { 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..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 @@ -4,43 +4,53 @@
-
- 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..626f24c5 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,18 +636,20 @@ $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: 20px; border: 1px solid #d5d0d0; - padding: 4px 8px 8px; - margin-bottom: 20px; - min-height: 20px; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; + height: 42px; .material-icons { vertical-align: bottom; @@ -657,7 +659,6 @@ $title-line-count: 2; input { border: 0 !important; - width: 84%; outline: none !important; } } @@ -702,4 +703,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..9274625f 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 @@ -37,6 +37,7 @@ export class UIAdminUserTableComponent implements OnInit, AfterViewInit, OnChang @Input() currentTabData!: string @Input() inputDepartmentId?: string | undefined @Input() showFirstLastButtonsFlag = false + @Input() isSurveySearch?: boolean @Output() clicked?: EventEmitter @Output() actionsClick?: EventEmitter @Output() eOnRowClick = new EventEmitter() @@ -68,6 +69,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 +138,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 +314,12 @@ export class UIAdminUserTableComponent implements OnInit, AfterViewInit, OnChang } onSearchEnter(event: any) { - this.searchText = event.target.value - this.searchByEnterKey.emit(event.target.value) + if (event === '' || event?.length === 0) { + this.searchByEnterKey.emit('') + } + else if (event?.length > 2) { + this.searchByEnterKey.emit(event) + } } downloadUsersReport(value: string) { 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..ad0b087b 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..659d9438 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/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..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 @@ -1,6 +1,6 @@
- arrow_back + arrow_back
{{bulkUploadConfig?.mainHeading}}
@@ -29,7 +29,7 @@
- CSV file logo + CSV file logo
{{bulkUploadConfig?.supportedFileTypeText2}}
@@ -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 e69de29b..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 @@ -0,0 +1,89 @@ + +.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; + width: 95%; + } + + .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; + } +} + +.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; + } +} \ 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..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 @@ -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 @@ -42,6 +48,7 @@ export class BulkUploadComponent implements OnInit, OnDestroy, AfterViewInit { startIndex = 0 lastIndex: any pageSize = 0 + orgId = '' constructor( private fileService: FileService, @@ -49,22 +56,37 @@ 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.orgId = _.get(this.activateRoute, 'snapshot.queryParams.roleId', '') 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 { @@ -79,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) => @@ -115,11 +138,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 +167,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 +178,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', }) @@ -175,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() @@ -187,6 +210,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 +226,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..f488aae1 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.

-
-
- + + +
+ empty_data +
+

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.scss b/project/ws/app/src/lib/routes/create-mdo/routes/designation/components/designations/designations.component.scss index fd2b9b24..885b7448 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 @@ -41,7 +41,9 @@ } .organisation-lable { + /* stylelint-disable */ font-family: 'lato'; + /* stylelint-enable */ font-weight: 700; font-size: 14px; line-height: 21px; @@ -54,7 +56,9 @@ .btn-upload { background: #1b4ca1 !important; color: white !important; + /* stylelint-disable */ font-family: 'Lato'; + /* stylelint-enable */ font-weight: 700; font-size: 14px; height: 40px; @@ -76,7 +80,9 @@ .sinput { margin-top: 0; + /* stylelint-disable */ font: normal 14px Lato; + /* stylelint-enable */ font-weight: 400; width: 390px; border-radius: 9999px; @@ -92,12 +98,15 @@ .emptyDesignations { height: calc(100vh - 600px); + min-height: 160px; } .empty-desigantions-text { font-size: 14px; font-weight: 600; + /* stylelint-disable */ font-family: Lato; + /* stylelint-enable */ } .download-icon { 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..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,8 +39,9 @@ export class DesignationsComponent implements OnInit { isMdoLeader: boolean }[] = [] orgId = '' + orgName = '' showTopSection = false - isImportDesignation = false + designationMaster = 'desigantion master' constructor( private designationsService: DesignationsService, private dialog: MatDialog, @@ -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 = [ // { @@ -115,17 +119,16 @@ export class DesignationsComponent implements OnInit { this.createFreamwork() } if (this.goToImportMaster) { - this.isImportDesignation = true + this.designationMaster = 'import designations' } }) - // this.getFrameworkInfo('0140788510336040962_odcs') } 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')) { @@ -354,8 +357,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..0ff6ece5 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
-
+
- + close
@@ -51,15 +51,14 @@
- 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..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 { @@ -96,27 +100,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/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))) } diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.html b/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.html index 46fa7830..7a3e8e4f 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.html @@ -12,7 +12,7 @@ + (searchByEnterKey)="onEnterkySearch($event)" [isSurveySearch]="true"> diff --git a/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts b/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts index 5dce8b81..a405656c 100644 --- a/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts +++ b/project/ws/app/src/lib/routes/create-mdo/routes/users/users.component.ts @@ -49,7 +49,7 @@ export class UsersComponent implements OnInit, AfterViewInit, OnDestroy { } isReportsPath = false userRoles: any - allowedCreateRoles = ['DASHBOARD_ADMIN', 'SPV_ADMIN', 'SPV_PUBLISHER'] + allowedCreateRoles = ['DASHBOARD_ADMIN', 'SPV_ADMIN', 'SPV_PUBLISHER', 'STATE_ADMIN'] constructor(private usersSvc: UsersService, private router: Router, private route: ActivatedRoute, private profile: ProfileV2Service, diff --git a/project/ws/app/src/lib/routes/create-mdo/search/search.component.html b/project/ws/app/src/lib/routes/create-mdo/search/search.component.html index 716b27a4..1ae0c11c 100644 --- a/project/ws/app/src/lib/routes/create-mdo/search/search.component.html +++ b/project/ws/app/src/lib/routes/create-mdo/search/search.component.html @@ -1,10 +1,12 @@
- search - +
+ search + +
+
\ No newline at end of file diff --git a/project/ws/app/src/lib/routes/create-mdo/search/search.component.scss b/project/ws/app/src/lib/routes/create-mdo/search/search.component.scss index 9238eddd..12716700 100644 --- a/project/ws/app/src/lib/routes/create-mdo/search/search.component.scss +++ b/project/ws/app/src/lib/routes/create-mdo/search/search.component.scss @@ -12,13 +12,25 @@ } .sinput { - border-radius: 4px; - border: 1px solid #d5d0d0; - padding: 15px 36px; - /* stylelint-disable */ - font: 400 14px Lato; - /* stylelint-enable */ - } +width: 400px; + border-radius: 20px; + border: 1px solid #d5d0d0; + padding: 8px 16px; + box-sizing: border-box; + // margin-bottom: 10px; + height: 42px; + + .material-icons { + vertical-align: middle; + font-size: 20px; + margin-right: 7px; + } + + input { + border: 0 !important; + outline: none !important; + } +} } .filter-section span { 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/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/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; +} diff --git a/project/ws/app/src/lib/routes/home/routes/create-user/create-user.component.html b/project/ws/app/src/lib/routes/home/routes/create-user/create-user.component.html index 7ea53a95..eb0585d1 100644 --- a/project/ws/app/src/lib/routes/home/routes/create-user/create-user.component.html +++ b/project/ws/app/src/lib/routes/home/routes/create-user/create-user.component.html @@ -197,13 +197,13 @@
@@ -463,8 +463,8 @@
-
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..2e66307d 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: 20px; 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; + height: 42px; + + .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/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; } } 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..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 @@ -17,54 +17,65 @@ file.
-
- - -
- - - - - - - + + + + Via CSV + + + + + + + + + Via API + + + + +
- - - - - + + + + Via CSV + + + + + +
- - - - - + + + + Via CSV + + + + + +
@@ -74,7 +85,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..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 @@ -61,7 +61,6 @@ export class ContentUploadComponent implements OnInit, OnChanges { unPublishedCoursesSearchKey = '' unPublishedCoursesTablePaginationDetails: any - uploadMode = 'viaCsv' defaultPagination = { startIndex: 0, @@ -73,6 +72,7 @@ export class ContentUploadComponent implements OnInit, OnChanges { delayTabLoad = true viaApiTabIndex = 0 + openedTab = '' //#endregion //#region (constructor: contains Intialization of TransforamtionControls from routes data) @@ -383,7 +383,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/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..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 @@ -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; + height: 42px; + + .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/help-center-guide/help-center-guide.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html index 618895b3..d14a2921 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/help-center-guide/help-center-guide.component.html @@ -8,11 +8,13 @@
-
-

- error_outline - {{note}} -

+
+ +
+
error_outline
+
{{note}}
+
+
diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/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/marketplace-provider/components/provider-details/provider-details.component.scss b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.scss index 7ecc3fc5..ec60ecc4 100644 --- a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.scss +++ b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/provider-details/provider-details.component.scss @@ -210,7 +210,7 @@ height: 40px; width: 75px; border: 1px solid #00000014; - border-radius: 8px; + border-radius: 20px; color: #000000DE; /* stylelint-enable */ @@ -222,7 +222,7 @@ background-color: #1B4CA1 !important; width: 75px; height: 40px; - border-radius: 8px; + border-radius: 20px; /* stylelint-enable */ font: 700 14px Lato; 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..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 @@ -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,12 +332,15 @@ 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) => { 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) }, }) @@ -353,8 +358,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,12 +374,15 @@ export class ProviderDetailsComponent implements OnInit, OnChanges { const successMsg = 'Provider details updated successfully.' this.showSnackBar(successMsg) this.sendDetailsUpdateEvent() - }, 1000) + }, 1000) } }, 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/transformations/transformations.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/transformations/transformations.component.html index 93ee2f87..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 @@ -56,32 +56,47 @@
- -
- -
- {{transFormControl.lable}} - : - - - - - {{header}} + + Map Form + Spec + + + +
+ +
+ + + + + {{header}} + + + + + {{transforamtionForm.value[transFormControl.controlName]}} + + + + select - - - - {{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..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; } @@ -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..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,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 { JsonEditorComponent, JsonEditorOptions } from 'ang-jsoneditor' @Component({ selector: 'ws-app-transformations', @@ -20,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 = '' @@ -35,7 +37,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 +51,7 @@ export class TransformationsComponent implements OnInit, OnChanges { executed = false uploadedFileHeadersList: string[] = [] availableHeadrsList: string[] = [] + editorOptions = new JsonEditorOptions() //#endregion //#endregion @@ -84,7 +89,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 +175,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 +203,37 @@ 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() + 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 && + JSON.stringify(this.transformationSpecForm.value) !== '{}' && isValidJson)) { 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({ @@ -229,7 +260,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 valid spec json' this.showSnackBar(message) } } @@ -266,7 +297,7 @@ export class TransformationsComponent implements OnInit, OnChanges { header = 'Upload Course Catalog' break case 'transformProgressJson': - header = 'Upload Course Pregress' + header = 'Upload Course Progress' break case 'certificateTemplateUrl': header = 'Upload Course Certificate' diff --git a/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html b/project/ws/app/src/lib/routes/home/routes/marketplace-provider/components/via-api/via-api.component.html index 0686b2d0..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 @@ -4,8 +4,58 @@ Configure Courses API
+ +
+ Link + info_outline +
+ +
+
+
+ + + + {{type.type}} + + + +
+
+ + + +
+
+
+ +
+ + + + + + + + + + + + + + + + + + +
+
-
+
Service Name @@ -71,7 +121,7 @@
-
+
Has Authentication @@ -102,74 +152,62 @@
-
- Link - info_outline -
- -
-
-
- - - - {{type.type}} - - - -
-
- - - -
-
-
- -
- - - - - - - - - - - - - - - - - - -
-
-
- Transform Content -
-
-
- - -
-
- + +
+
+ Transform {{transformationType === 'transformContentViaApi' ? '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 3d4b5d39..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 @@ -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,10 +14,12 @@ 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 @Input() tabIndex = -1 + @Input() transformationType = '' @Output() loadProviderDetails = new EventEmitter() //#endregion @@ -34,7 +36,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 +68,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 +116,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) { @@ -125,7 +126,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() @@ -134,7 +138,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 } @@ -219,8 +223,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 +272,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(this.providerDetails, this.transformationType, _.get(this.providerConfiguration, this.transformationType)) + this.transformationSpecForm.patchValue(transformContent) } @@ -320,6 +324,24 @@ export class ViaApiComponent implements OnInit, OnChanges { this.servicesFormGroup.controls.strictCacheTimeInMinutes.updateValueAndValidity() } + get getUpdateBtnText(): string { + let btnText = '' + if (this.transformationType === 'transformContentViaApi') { + if (this.providerConfiguration && this.providerConfiguration.transformContentViaApi) { + btnText = 'Update Transform Content' + } else { + btnText = 'Save Transform Content' + } + } else if (this.transformationType === 'transformProgressViaApi') { + if (this.providerConfiguration && 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 +383,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) @@ -374,6 +396,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, @@ -391,18 +414,18 @@ 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: authPayload ? authPayload : {}, + strictCache: serviceDetails.strictCache, + strictCacheTimeInMinutes: serviceDetails.strictCacheTimeInMinutes } return formBody } getParamsAndUrl() { const parmsAndUrl = { - url: `${this.viaApiFormGroup.controls.apiUrl.value.split('?')[0]}`, + url: `${this.actualUrl}`, urlPlaceholder: '', } const params = this.paramsFormGroup.value.tableListFormArray @@ -436,30 +459,36 @@ 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 - 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) - }, - }) + const hasTransformationAlready = this.providerDetails[this.transformationType] ? true : false + this.transformationSpecForm.markAsTouched() + 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 = 'Please provide all mandatory fields' + } 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 spec json' this.showSnackBar(message) } } 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/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..5f18aff1 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/roles-users/roles-users.component.html b/project/ws/app/src/lib/routes/home/routes/roles-users/roles-users.component.html index 50ac5385..5f103eaf 100644 --- a/project/ws/app/src/lib/routes/home/routes/roles-users/roles-users.component.html +++ b/project/ws/app/src/lib/routes/home/routes/roles-users/roles-users.component.html @@ -11,7 +11,8 @@ + [otherInput]="createdDepartment" [needAddAdmin]="false" [needCreateUser]="false" + (searchByEnterKey)="onEnterkySearch($event)" [isSurveySearch]="true"> diff --git a/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.html b/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.html index 163c27b4..4a22fd26 100644 --- a/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.html +++ b/project/ws/app/src/lib/routes/home/routes/sectors/add-sector/add-sector.component.html @@ -61,14 +61,14 @@
-
-
- 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; } } 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..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 @@ -2,17 +2,33 @@
-
-
-
- search - + +
+
+ + +
+ 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..022707f3 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: 20px; 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; + height: 42px; + + .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'; 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 diff --git a/project/ws/app/src/lib/routes/home/routes/survey/survey-list/survey-list.component.html b/project/ws/app/src/lib/routes/home/routes/survey/survey-list/survey-list.component.html index f5b33dfa..862b3552 100644 --- a/project/ws/app/src/lib/routes/home/routes/survey/survey-list/survey-list.component.html +++ b/project/ws/app/src/lib/routes/home/routes/survey/survey-list/survey-list.component.html @@ -16,7 +16,8 @@ [needAddAdmin]="false" [needCreateUser]="false"> --> + [needAddAdmin]="false" [showFirstLastButtonsFlag]="true" [needCreateUser]="false" [totalDataRecords]="data" + [isSurveySearch]="false"> 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 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', 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 +}) 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
Area Theme