Merge pull request #929 from bcgov/feature/DSS-1179

saikrishnametpalli-nttdata · web-flow · commit 0550f7a2c482 · 2025-08-29T08:32:08.000-07:00
DSS-1179 Platform Name Dropdown Order Alphabetically and Searchable
diff --git a/frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html b/frontend/src/app/common/listing-upload-history-table/listing-upload-history-table.component.html
@@ -7,7 +7,7 @@ <h2>Platform Reporting History</h2>
         <div class="form-group-row-col">
             <p-dropdown [options]=" platformOptions" [(ngModel)]="selectedPlatformId"
                 (onChange)="onPlatformSelected($event.value)" placeholder="Select platform" id="platformId"
-                name="platformId" [required]="true"></p-dropdown>
+                name="platformId" [required]="true" [filter]="true" filterBy="label"></p-dropdown>
         </div>
     </div>
     <p-table [value]="listings" styleClass="p-datatable-sm" [tableStyle]="{ 'min-width': '50rem' }">
diff --git a/frontend/src/app/features/components/compliance-notice/compliance-notice.component.html b/frontend/src/app/features/components/compliance-notice/compliance-notice.component.html
@@ -11,7 +11,7 @@
         </div>
         <div class="form-group-row-col">
             <p-dropdown [options]="platformOptions" formControlName="platformId" placeholder="Select platform"
-                id="platformId" name="platformId" [required]="true"></p-dropdown>
+                id="platformId" name="platformId" [required]="true" [filter]="true" filterBy="label"></p-dropdown>
         </div>
         <div class="form-group-row-col validation-errors"
             *ngIf="!platformIdControl.pristine && platformIdControl.errors">
diff --git a/frontend/src/app/features/components/delisting-request/delisting-request.component.html b/frontend/src/app/features/components/delisting-request/delisting-request.component.html
@@ -16,7 +16,7 @@
         </div>
         <div class="form-group-row-col">
             <p-dropdown [options]="platformOptions" formControlName="platformId" placeholder="Select platform"
-                id="platformId" name="platformId" [required]="true"></p-dropdown>
+                id="platformId" name="platformId" [required]="true" [filter]="true" filterBy="label"></p-dropdown>
         </div>
         <div class="form-group-row-col validation-errors"
             *ngIf="!platformIdControl.pristine && platformIdControl.errors">
diff --git a/frontend/src/app/features/components/registration-validation-history/registration-validation-history.component.html b/frontend/src/app/features/components/registration-validation-history/registration-validation-history.component.html
@@ -7,7 +7,7 @@ <h2>Validation Reports</h2>
         <div class="form-group-row-col">
             <p-dropdown [options]=" platformOptions" [(ngModel)]="selectedPlatformId"
                 (onChange)="onPlatformSelected($event.value)" placeholder="Select platform" id="platformId"
-                name="platformId" [required]="true"></p-dropdown>
+                name="platformId" [required]="true" [filter]="true" filterBy="label"></p-dropdown>
         </div>
     </div>
     <p-table [value]="registrationValidationHistory" styleClass="p-datatable-sm" [tableStyle]="{ 'min-width': '50rem' }">
diff --git a/frontend/src/app/features/components/upload-listings/upload-listings.component.html b/frontend/src/app/features/components/upload-listings/upload-listings.component.html
@@ -24,7 +24,7 @@
         </div>
         <div class="form-group-row-col">
             <p-dropdown [options]="platformOptions" formControlName="platformId" placeholder="Select platform"
-                id="platformId" name="platformId" [required]="true"></p-dropdown>
+                id="platformId" name="platformId" [required]="true" [filter]="true" filterBy="label"></p-dropdown>
         </div>
         <div class="form-group-row-col validation-errors"
             *ngIf="!platformIdControl.pristine && platformIdControl.errors">
diff --git a/frontend/src/app/features/components/validate-registration-data/validate-registration-data.component.html b/frontend/src/app/features/components/validate-registration-data/validate-registration-data.component.html
@@ -9,7 +9,7 @@
         </div>
         <div class="form-group-row-col">
             <p-dropdown [options]="platformOptions" formControlName="platformId" placeholder="Select platform"
-                id="platformId" name="platformId" [required]="true"></p-dropdown>
+                id="platformId" name="platformId" [required]="true" [filter]="true" filterBy="label"></p-dropdown>
         </div>
         <div class="form-group-row-col validation-errors"
             *ngIf="!platformIdControl.pristine && platformIdControl.errors">
diff --git a/server/StrDss.Data/Repositories/OrganizationRepository.cs b/server/StrDss.Data/Repositories/OrganizationRepository.cs
@@ -102,7 +102,8 @@ public async Task<List<OrganizationDto>> GetOrganizationsAsync(string? type)
                 query = query.Where(x => x.OrganizationType != OrganizationTypes.LGSub);
             }
 
-            query = query.Include(x => x.DssOrganizationContactPeople);
+            query = query.Include(x => x.DssOrganizationContactPeople)
+                         .OrderBy(x => x.OrganizationNm);
 
             return _mapper.Map<List<OrganizationDto>>(await query.ToListAsync());
         }

Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,8 @@ public async Task<List<OrganizationDto>> GetOrganizationsAsync(string? type)`
`102`	`102`	`query = query.Where(x => x.OrganizationType != OrganizationTypes.LGSub);`
`103`	`103`	`}`
`104`	`104`
`105`		`- query = query.Include(x => x.DssOrganizationContactPeople);`
	`105`	`+ query = query.Include(x => x.DssOrganizationContactPeople)`
	`106`	`+ .OrderBy(x => x.OrganizationNm);`
`106`	`107`
`107`	`108`	`return _mapper.Map<List<OrganizationDto>>(await query.ToListAsync());`
`108`	`109`	`}`