Merge pull request #296 from GOKULRAJ136/patch-sonar

MOSIP-25193 : Reliability bugs on Admin-Ui Module
mosip · Mar 13, 2024 · 3df072d · 3df072d
2 parents f2cc717 + 4ed9031
commit 3df072d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/admin-ui/src/app/features/download-card/download-card/download-card.component.html b/admin-ui/src/app/features/download-card/download-card/download-card.component.html
@@ -2,15 +2,20 @@
     <p class="packet-status__header-text">{{'download-card.header' | translate}}</p>
     <mat-card style="border-radius: 0;">
         <table style="width: 100%;">
+            <caption>Download Card Table</caption>
             <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>
+                    <th id="textColumn" style="width: 50%;">
+                        <strong><span style="font-family: Roboto, sans-serif; margin-left:30px; font-size: 12px;">{{'download-card.text' | translate}}</span></strong>
+                    </th>
+                    <th id="limitColumn" 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>
+                    </th>
                 </tr>
                 <tr>
-                    <td colspan="2">
+                    <th id="downloadCard" colspan="2">
                         <span style="font-family: Roboto, sans-serif; margin-left: 30px; font-size: 10px;">Download Card</span>
-                    </td>
+                    </th>
                 </tr>
             </thead>
         </table><br>
@@ -27,8 +32,8 @@
                     <caption>Download Card Information</caption>
                     <thead>
                         <tr>
-                            <th>Download Card DOB</th>
-                            <th>Download Card Verify</th>
+                            <th id="dobHeader">Download Card DOB</th>
+                            <th id="verifyHeader">Download Card Verify</th>
                         </tr>
                     </thead>
                     <tr>
@@ -37,13 +42,13 @@
                             <table>
                                 <caption>Download Card Details</caption>
                                 <tr>
-                                    <th>{{ 'download-card.dob' | translate }}</th>
+                                    <th id="dateOfBirthHeader">{{ 'download-card.dob' | translate }}</th>
                                 </tr>
                                 <tr>
-                                    <th>{{ data.dateOfBirth }}</th>
+                                    <th id="dateOfBirth">{{ data.dateOfBirth }}</th>
                                 </tr>
                                 <tr>
-                                    <th>{{ 'download-card.verify' | translate }}</th>
+                                    <th id="verificationHeader">{{ 'download-card.verify' | translate }}</th>
                                 </tr>
                                 <tr>
                                     <td><strong>{{'download-card.dob' | translate}} :</strong> {{data.dateOfBirth}}</td>
@@ -58,7 +63,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>
+                                    <th id="actionHeader">Action</th>
                                 </tr>
                                 <tr>
                                     <td>

diff --git a/admin-ui/src/app/shared/dialog/dialog.component.ts b/admin-ui/src/app/shared/dialog/dialog.component.ts
@@ -387,9 +387,7 @@ export class DialogComponent implements OnInit {
           const filterValue = this.filterGroup.controls[key].value.toString();
           if (filterValue.endsWith('*') || filterValue.startsWith('*') || filterValue.includes('*')) {
             filterType = 'contains';
-        } else {
-            filterType = 'contains';
-          }
+        }
         } else if (
           filter[0].dropdown === 'true' &&
           filter[0].autocomplete === 'false'

diff --git a/admin-ui/src/app/shared/table/table.component.html b/admin-ui/src/app/shared/table/table.component.html
@@ -1,5 +1,6 @@
 <div class="container">
   <table class="mat-table">
+    <caption>Table Data</caption>
     <tr class="mat-row sticky-header">
       <th *ngIf="showRadioButton" id="tableData"></th>
       <th

diff --git a/admin-ui/src/app/shared/toolbar/toolbar.component.html b/admin-ui/src/app/shared/toolbar/toolbar.component.html
@@ -12,7 +12,7 @@
           'filter-button-style': button.buttonName.eng === 'Filter'
         }"
       >
-      <img [src]="button.imagePath"/>
+      <img [src]="button.imagePath" alt="img"/>
       <span class="button-name">{{ button.buttonName[lang]}}</span>
         <span class="filter-placer" *ngIf="button.buttonName.eng === 'Filter' && filtersAppliedFlag">
           <em style="font-size: 16px;" class="material-icons">fiber_manual_record</em>