Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-25193 : Resolve Reliability Bugs on Admin-UI #292

Merged
merged 1 commit into from
Mar 7, 2024
+103 −84
Merged

MOSIP-25193 : Resolve Reliability Bugs on Admin-UI #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions admin-ui/src/app/core/header/header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
alt="Logo"/></span
>&nbsp;
<span [ngStyle]="{ display: screenResize > 840 ? 'inline-block' : 'none' }"
><b class="mosip-text">MOSIP</b
><b class="version-txt"> {{ 'headermessage.vesion' | translate }} : {{ appVersion }}</b></span
><strong class="mosip-text">MOSIP</strong
><strong class="version-txt"> {{ 'headermessage.vesion' | translate }} : {{ appVersion }}</strong></span
>
</div>
<div class="zone">
Expand Down
1 change: 0 additions & 1 deletion admin-ui/src/app/features/bulkupload/masterdataupload/create/create.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
align-items: center;
border: dashed 1px #FF4081;
margin-bottom: 1rem;
display: flex;
flex-grow: 1;
margin-left: 8px;
width:25%;
Expand Down
1 change: 0 additions & 1 deletion admin-ui/src/app/features/bulkupload/packetdataupload/create/create.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
align-items: center;
border: dashed 1px #FF4081;
margin-bottom: 1rem;
display: flex;
flex-grow: 1;
margin-left: 8px;
width:25%;
Expand Down
35 changes: 30 additions & 5 deletions admin-ui/src/app/features/download-card/download-card/download-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@
<p class="packet-status__header-text">{{'download-card.header' | translate}}</p>
<mat-card style="border-radius: 0;">
<table style="width: 100%;">
<tr>
<td style="width: 50%;"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.text' | translate}}</span></strong></td>
<td style="width: 50%;text-align: right;" *ngIf="searchLimitCount"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.searchLimit' | translate}}&nbsp;{{searchLimitCount}}&nbsp;{{'download-card.outof' | translate}}&nbsp;{{searchLimitMaxCount}}&nbsp;{{'download-card.dailylimit' | translate}}</span></strong></td>
</tr>
<thead>
<tr>
<td style="width: 50%;"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.text' | translate}}</span></strong></td>
<td style="width: 50%;text-align: right;" *ngIf="searchLimitCount"><strong><span style=" font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.searchLimit' | translate}}&nbsp;{{searchLimitCount}}&nbsp;{{'download-card.outof' | translate}}&nbsp;{{searchLimitMaxCount}}&nbsp;{{'download-card.dailylimit' | translate}}</span></strong></td>
</tr>
<tr>
<td colspan="2">
<span style="font-family: Roboto, sans-serif; margin-left: 30px; font-size: 10px;">Download Card</span>
</td>
</tr>
</thead>
</table><br>
<mat-form-field class="packet-status__input-placer">
<input matInput placeholder="Enter Registration ID" [(ngModel)]="id"/>
Expand All @@ -17,10 +24,27 @@
<div class="packet-status__details-container" *ngIf="data">
<div>
<table>
<caption>Download Card Information</caption>
<thead>
<tr>
<th>Download Card DOB</th>
<th>Download Card Verify</th>
</tr>
</thead>
<tr>
<td><img style="width: 150px;height: 200px;" [src]="applicantPhoto"></td>
<td><img style="width: 150px;height: 200px;" [src]="applicantPhoto" alt="Applicant Photo"></td>
<td>
<table>
<caption>Download Card Details</caption>
<tr>
<th>{{ 'download-card.dob' | translate }}</th>
</tr>
<tr>
<th>{{ data.dateOfBirth }}</th>
</tr>
<tr>
<th>{{ 'download-card.verify' | translate }}</th>
</tr>
<tr>
<td><strong>{{'download-card.dob' | translate}} :</strong> {{data.dateOfBirth}}</td>
</tr>
Expand All @@ -34,6 +58,7 @@
<mat-button-toggle (click)="captureSelection('false')" value="flase"><mat-icon style="color:red;">clear</mat-icon>&nbsp;&nbsp;{{'download-card.reject' | translate}}</mat-button-toggle>
</mat-button-toggle-group>
</td>
<th>Action</th>
</tr>
<tr>
<td>
Expand Down
12 changes: 6 additions & 6 deletions ...pp/features/masterdata/document-category-mapping/document-category-mapping.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
<li class="list" [ngClass]="{'active': selectedItem === categoryList?.code}"
(click)="onCategory(categoryList)">
<span>{{categoryList?.name}}({{categoryList?.code}})</span>
<span><i class="material-icons">
<span><em class="material-icons">
keyboard_arrow_right
</i></span></li>
</em></span></li>
</ng-container>
</ul>
</div>
Expand All @@ -47,9 +47,9 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
<ng-container *ngFor="let mappedItem of mappedDocList; let i = index">
<li class="list">
<span>{{mappedItem?.name}}</span>
<span><i class="material-icons" (click)="onClose(mappedItem, i)">
<span><em class="material-icons" (click)="onClose(mappedItem, i)">
close
</i></span></li>
</em></span></li>
</ng-container>
</ul>
</div>
Expand All @@ -62,9 +62,9 @@ <h4>{{'masterData.doc-category-mapping'|translate}}<span></span></h4>
<ng-container *ngFor="let unMappedItem of unMappedDocList; let i = index">
<li class="list">
<span>{{unMappedItem?.name}}</span>
<span><i class="material-icons" (click)="onAdd(unMappedItem, i)">
<span><em class="material-icons" (click)="onAdd(unMappedItem, i)">
add
</i></span></li>
</em></span></li>
</ng-container>
</ul>
</div>
Expand Down
25 changes: 12 additions & 13 deletions admin-ui/src/app/features/masterdata/list-view/list-view.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,18 @@ export class ListViewComponent implements OnDestroy {
}
}

loadBlacklistedWords(): void {
new Promise(async (resolve, reject) => {
const data = [];
await this.getMasterDataTypeValues('all').then(response => {
if (response['data']) {
data.push(...response['data']);
console.log(response);
}
});
this.masterData = data;
//this.paginatorOptions.totalEntries = this.masterData.length;
resolve(true);
});
async loadBlacklistedWords(): Promise<void> {
try {
const response = await this.getMasterDataTypeValues('all');
if (response && response['data']) {
this.masterData = response['data'];
console.log(response);
}
// this.paginatorOptions.totalEntries = this.masterData.length;
} catch (error) {
console.error('Error loading blacklisted words:', error);
throw error;
}
}

loadData() {
Expand Down
36 changes: 18 additions & 18 deletions admin-ui/src/app/features/masterdata/master-data/master-data.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@
<div class="sub-item1">
<mat-card>
<mat-card-header class="header">
<b>{{'masterData.common' | translate}}</b>
<strong>{{'masterData.common' | translate}}</strong>
</mat-card-header>
<ng-container *ngFor="let itemList of masterDataCommonList; let i = index">
<mat-card-content class="content" [style.marginTop.px]="i === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
<span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
<span style="text-align: right"><i class="material-icons">
<span style="text-align: right"><em class="material-icons">
{{arrowDirection}}
</i></span>
</em></span>
</mat-card-content>
</ng-container>
</mat-card>
</div>
<div class="sub-item2">
<mat-card >
<mat-card-header class="header">
<b>{{'masterData.dynamicField' | translate}}</b>
<strong>{{'masterData.dynamicField' | translate}}</strong>
</mat-card-header>
<ng-container>
<mat-card-content class="content" (click)="dynamicFeildAdd()" id="createDynamicField">
<span style="margin-top: 5px; margin-left: 5px;"><b>{{'masterData.createDynamicField' | translate}}</b></span>
<span style="text-align: right"><i class="material-icons">
<span style="margin-top: 5px; margin-left: 5px;"><strong>{{'masterData.createDynamicField' | translate}}</strong></span>
<span style="text-align: right"><em class="material-icons">
add
</i></span>
</em></span>
</mat-card-content>
</ng-container>
<ng-container *ngFor="let itemList of dynamicfieldDistinctValue; let i = index">
Expand All @@ -40,9 +40,9 @@
<span *ngIf="itemList.description">{{itemList.description}}</span>
<span *ngIf="!itemList.description">{{itemList.name}}</span>
</span>
<span style="text-align: right"><i class="material-icons">
<span style="text-align: right"><em class="material-icons">
{{arrowDirection}}
</i></span>
</em></span>
</mat-card-content>
</ng-container>
</mat-card >
Expand All @@ -54,44 +54,44 @@
<div class="sub-item1">
<mat-card >
<mat-card-header class="header">
<b>{{'masterData.device-definition' | translate}}</b>
<strong>{{'masterData.device-definition' | translate}}</strong>
</mat-card-header>
<ng-container *ngFor="let itemList of masterDataDeviceList; let j = index">
<mat-card-content class="content" [style.marginTop.px]="j === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
<span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
<span style="text-align: right"><i class="material-icons">
<span style="text-align: right"><em class="material-icons">
{{arrowDirection}}
</i></span>
</em></span>
</mat-card-content>
</ng-container>
</mat-card >
</div>
<div class="sub-item2">
<mat-card>
<mat-card-header class="header">
<b>{{'masterData.machine-definition' | translate}}</b>
<strong>{{'masterData.machine-definition' | translate}}</strong>
</mat-card-header>
<ng-container *ngFor="let itemList of masterDataMachineList; let k = index">
<mat-card-content class="content" [style.marginTop.px]="k === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
<span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
<span style="text-align: right"><i class="material-icons">
<span style="text-align: right"><em class="material-icons">
{{arrowDirection}}
</i></span>
</em></span>
</mat-card-content>
</ng-container>
</mat-card>
</div>
<div class="sub-item3">
<mat-card>
<mat-card-header class="header">
<b>{{'masterData.document-definition' | translate}}</b>
<strong>{{'masterData.document-definition' | translate}}</strong>
</mat-card-header>
<ng-container *ngFor="let itemList of masterDataDocumentList; let l = index">
<mat-card-content class="content" [style.marginTop.px]="l === 0 ? 10:0" (click)="onList(itemList)" id="{{itemList.actionURL}}">
<span style="margin-top: 5px; margin-left: 5px;">{{itemList?.label[primaryLang]}}</span>
<span style="text-align: right"><i class="material-icons">
<span style="text-align: right"><em class="material-icons">
{{arrowDirection}}
</i></span>
</em></span>
</mat-card-content>
</ng-container>
</mat-card>
Expand Down
10 changes: 5 additions & 5 deletions ...p/features/masterdata/shared/mater-data-common-body/mater-data-common-body.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
(click)="openKeyboard('primary', primaryData.langCode)"
style="color: grey; cursor: pointer;"
[ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"
><i class="material-icons">keyboard</i></span
><em class="material-icons">keyboard</em></span
>
<hr />
<br /><br />
Expand Down Expand Up @@ -414,7 +414,7 @@
<mat-divider [vertical]="true" [inset]="true"></mat-divider>
<div *ngIf="showSecondaryForm" class="secondary-form" [dir]="secondaryLang==='ara' ? 'rtl' : 'ltr'">
<mat-form-field style="padding-bottom: 10px;">
<mat-label><b>{{ "center.selectLanguage" | translate }}</b></mat-label>
<mat-label><strong>{{ "center.selectLanguage" | translate }}</strong></mat-label>
<mat-select
id="secondaryLang"
[(value)]="secondaryLang"
Expand All @@ -435,7 +435,7 @@
(click)="openKeyboard('secondary', '')"
style="color: grey; cursor: pointer;"
[ngStyle]="isPrimaryLangRTL ? {'float':'left'} : {'float':'right'}"
><i class="material-icons">keyboard</i></span
><em class="material-icons">keyboard</em></span
>
<hr [ngStyle]="isPrimaryLangRTL ? {'margin-top': '17px'} : {'margin-top': '0px'}" />
<br /><br />
Expand Down Expand Up @@ -764,7 +764,7 @@
matTooltip="{{ 'center.keyboard-tooltip' | translate }}"
(click)="openKeyboard('primary','')"
style="float: right; color: grey; cursor: pointer;"
><i class="material-icons">keyboard</i></span
><em class="material-icons">keyboard</em></span
>
<hr />
<br /><br />
Expand Down Expand Up @@ -794,7 +794,7 @@
matTooltip="{{languageNames['keyboard-tooltip'] | translate }}"
(click)="openKeyboard('secondary', '')"
style="float: right; color: grey; cursor: pointer;"
><i class="material-icons">keyboard</i></span
><em class="material-icons">keyboard</em></span
>
<hr />
<br /><br />
Expand Down
Loading
Loading