From 52f1cbf790ccc5c8ee887f7738a8391d2fec3630 Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 29 Aug 2025 09:35:59 -0700
Subject: [PATCH 1/4] Add Location filter to unit library. Each location can
 have 3 levels

---
 src/app/domain/projectFilterValues.ts         | 16 +++-
 src/app/modules/library/Location.ts           | 40 ++++++++
 .../library-filters.component.html            | 17 ++++
 .../library-filters.component.ts              | 25 ++++-
 .../location-select-menu.component.html       | 25 +++++
 .../location-select-menu.component.ts         | 35 +++++++
 src/messages.xlf                              | 92 ++++++++++++-------
 7 files changed, 213 insertions(+), 37 deletions(-)
 create mode 100644 src/app/modules/library/Location.ts
 create mode 100644 src/app/modules/shared/location-select-menu/location-select-menu.component.html
 create mode 100644 src/app/modules/shared/location-select-menu/location-select-menu.component.ts

diff --git a/src/app/domain/projectFilterValues.ts b/src/app/domain/projectFilterValues.ts
index 49434eb6659..9a3a3e7017e 100644
--- a/src/app/domain/projectFilterValues.ts
+++ b/src/app/domain/projectFilterValues.ts
@@ -1,10 +1,12 @@
 import { Subject } from 'rxjs';
 import { LibraryProject } from '../modules/library/libraryProject';
+import { Location } from '../modules/library/Location';
 
 export class ProjectFilterValues {
   disciplineValue: string[] = [];
   featureValue: string[] = [];
   gradeLevelValue: number[] = [];
+  locationValue: string[] = [];
   publicUnitType?: ('wiseTested' | 'communityBuilt')[] = [];
   publicUnitTypeValue?: ('wiseTested' | 'communityBuilt')[] = [];
   searchValue: string = '';
@@ -21,7 +23,8 @@ export class ProjectFilterValues {
       this.matchesDiscipline(project) &&
       this.matchesUnitType(project) &&
       this.matchesFeature(project) &&
-      this.matchesGradeLevel(project)
+      this.matchesGradeLevel(project) &&
+      this.matchesLocation(project)
     );
   }
 
@@ -95,6 +98,17 @@ export class ProjectFilterValues {
     );
   }
 
+  private matchesLocation(project: LibraryProject): boolean {
+    return (
+      this.locationValue.length === 0 ||
+      project.metadata.locations
+        ?.map((location) => Object.assign(new Location(), location))
+        .map((location) => location.getLocationOptions())
+        .flat()
+        .some((locationOption) => this.locationValue.includes(locationOption.id))
+    );
+  }
+
   private matchesFeature(project: LibraryProject): boolean {
     return (
       this.featureValue.length === 0 ||
diff --git a/src/app/modules/library/Location.ts b/src/app/modules/library/Location.ts
new file mode 100644
index 00000000000..b3d80bc76ba
--- /dev/null
+++ b/src/app/modules/library/Location.ts
@@ -0,0 +1,40 @@
+export type LocationType = 'level1' | 'level2' | 'level3';
+
+export const locationTypeToLabel: { [key in LocationType]: string } = {
+  level3: $localize`Locale`,
+  level2: $localize`State`,
+  level1: $localize`Country`
+};
+
+export class LocationOption {
+  id: string;
+  name: string;
+  type: LocationType;
+  constructor(type: LocationType, name: string) {
+    this.type = type;
+    this.name = name;
+    this.id = `${locationTypeToLabel[type]}:${name}`;
+  }
+}
+
+// Represents a geographical location associated with a project
+export class Location {
+  id: string = '';
+  level1: string = ''; // country
+  level2: string = ''; // state
+  level3: string = ''; // city, county, or other locale
+
+  getLocationOptions(): LocationOption[] {
+    const options = [];
+    if (this.level1) {
+      options.push(new LocationOption('level1', this.level1));
+    }
+    if (this.level2) {
+      options.push(new LocationOption('level2', `${this.level2}, ${this.level1}`));
+    }
+    if (this.level3) {
+      options.push(new LocationOption('level3', `${this.level3}, ${this.level2}, ${this.level1}`));
+    }
+    return options;
+  }
+}
diff --git a/src/app/modules/library/library-filters/library-filters.component.html b/src/app/modules/library/library-filters/library-filters.component.html
index 52a9022624b..d5b43c73c39 100644
--- a/src/app/modules/library/library-filters/library-filters.component.html
+++ b/src/app/modules/library/library-filters/library-filters.component.html
@@ -127,5 +127,22 @@ <h3 class="mat-subtitle-2" i18n>Filters</h3>
         />
       </div>
     }
+    @if (locationOptions.length > 0) {
+      <div
+        class="library-filter"
+        [ngClass]="{ 'md:w-full': isSplitScreen, 'md:w-1/4': !isSplitScreen }"
+      >
+        <location-select-menu
+          [options]="locationOptions"
+          i18n-placeholderText
+          placeholderText="Locations"
+          [value]="filterValues.locationValue"
+          (update)="filterUpdated($event, 'location')"
+          [valueProp]="'id'"
+          [viewValueProp]="'name'"
+          [multiple]="true"
+        />
+      </div>
+    }
   </div>
 </div>
diff --git a/src/app/modules/library/library-filters/library-filters.component.ts b/src/app/modules/library/library-filters/library-filters.component.ts
index 808b7e5cb9b..8dac1800901 100644
--- a/src/app/modules/library/library-filters/library-filters.component.ts
+++ b/src/app/modules/library/library-filters/library-filters.component.ts
@@ -16,6 +16,8 @@ import { Feature } from '../Feature';
 import { Grade, GradeLevel } from '../GradeLevel';
 import { MatDialog } from '@angular/material/dialog';
 import { DialogWithCloseComponent } from '../../../../assets/wise5/directives/dialog-with-close/dialog-with-close.component';
+import { Location } from '../Location';
+import { LocationSelectMenuComponent } from '../../shared/location-select-menu/location-select-menu.component';
 
 @Component({
   imports: [
@@ -23,6 +25,7 @@ import { DialogWithCloseComponent } from '../../../../assets/wise5/directives/di
     MatBadgeModule,
     MatButtonModule,
     MatIconModule,
+    LocationSelectMenuComponent,
     SearchBarComponent,
     SelectMenuComponent,
     StandardsSelectMenuComponent
@@ -44,6 +47,7 @@ export class LibraryFiltersComponent {
   private sharedProjects: LibraryProject[] = [];
   protected showFilters: boolean = false;
   protected standardOptions: Standard[] = [];
+  protected locationOptions: Location[] = [];
   protected unitTypeOptions: { id: string; name: string }[] = [
     { id: 'WISE Platform', name: $localize`WISE Platform` },
     { id: 'Other Platform', name: $localize`Other Platform` }
@@ -97,6 +101,7 @@ export class LibraryFiltersComponent {
     );
     this.populateGradeLevels(project);
     this.populateStandards(project);
+    this.populateLocations(project);
   }
 
   private populateGradeLevels(project: LibraryProject): void {
@@ -123,12 +128,23 @@ export class LibraryFiltersComponent {
     });
   }
 
+  private populateLocations(project: LibraryProject): void {
+    project.metadata.locations?.forEach((location: Location) =>
+      this.locationOptions.push(Object.assign(new Location(), location))
+    );
+  }
+
   private removeDuplicatesAndSortAlphabetically(): void {
     this.standardOptions = this.utilService.removeObjectArrayDuplicatesByProperty(
       this.standardOptions,
       'id'
     );
     this.utilService.sortObjectArrayByProperty(this.standardOptions, 'id');
+    this.locationOptions = this.utilService.removeObjectArrayDuplicatesByProperty(
+      this.locationOptions,
+      'id'
+    );
+    this.utilService.sortObjectArrayByProperty(this.locationOptions, 'id');
     this.disciplineOptions = this.utilService.removeObjectArrayDuplicatesByProperty(
       this.disciplineOptions,
       'id'
@@ -168,6 +184,9 @@ export class LibraryFiltersComponent {
       case 'unitType':
         this.filterValues.unitTypeValue = value;
         break;
+      case 'location':
+        this.filterValues.locationValue = value;
+        break;
     }
     this.emitFilterValues();
   }
@@ -182,9 +201,9 @@ export class LibraryFiltersComponent {
   }
 
   protected showTypeInfo(): void {
-    const message = $localize`"Type" indicates the platform on which a unit runs. "WISE Platform" units are created 
-      using the WISE authoring tool. Students use WISE accounts to complete lessons and teachers can review and grade 
-      work on the WISE platform. "Other" units are created using different platforms. Resources for these units 
+    const message = $localize`"Type" indicates the platform on which a unit runs. "WISE Platform" units are created
+      using the WISE authoring tool. Students use WISE accounts to complete lessons and teachers can review and grade
+      work on the WISE platform. "Other" units are created using different platforms. Resources for these units
       are linked in the unit details.`;
     this.dialog.open(DialogWithCloseComponent, {
       data: {
diff --git a/src/app/modules/shared/location-select-menu/location-select-menu.component.html b/src/app/modules/shared/location-select-menu/location-select-menu.component.html
new file mode 100644
index 00000000000..99bf52db579
--- /dev/null
+++ b/src/app/modules/shared/location-select-menu/location-select-menu.component.html
@@ -0,0 +1,25 @@
+<mat-form-field class="select-menu" appearance="fill" [subscriptSizing]="'dynamic'">
+  <mat-label>{{ placeholderText }}</mat-label>
+  <mat-select
+    [formControl]="selectField"
+    [placeholder]="placeholderText"
+    [(value)]="value"
+    [multiple]="multiple"
+  >
+    @if (multiple) {
+      <mat-select-trigger>
+        {{ selectField.value ? selectField.value[0] : '' }}
+        @if (selectField.value?.length > 1) {
+          <span>(+{{ selectField.value.length - 1 }} <ng-container i18n>more</ng-container>)</span>
+        }
+      </mat-select-trigger>
+    }
+    @for (label of labels; track label) {
+      <mat-optgroup [label]="locationTypeToLabel[label]">
+        @for (option of locationOptions[label]; track option.id) {
+          <mat-option [value]="option[valueProp]">{{ option[viewValueProp] }}</mat-option>
+        }
+      </mat-optgroup>
+    }
+  </mat-select>
+</mat-form-field>
diff --git a/src/app/modules/shared/location-select-menu/location-select-menu.component.ts b/src/app/modules/shared/location-select-menu/location-select-menu.component.ts
new file mode 100644
index 00000000000..28230ae521a
--- /dev/null
+++ b/src/app/modules/shared/location-select-menu/location-select-menu.component.ts
@@ -0,0 +1,35 @@
+import { Component } from '@angular/core';
+import { SelectMenuComponent } from '../select-menu/select-menu.component';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatSelectModule } from '@angular/material/select';
+import {
+  Location,
+  LocationOption,
+  LocationType,
+  locationTypeToLabel
+} from '../../library/Location';
+
+@Component({
+  imports: [FormsModule, MatSelectModule, ReactiveFormsModule],
+  selector: 'location-select-menu',
+  templateUrl: './location-select-menu.component.html'
+})
+export class LocationSelectMenuComponent extends SelectMenuComponent {
+  protected labels: LocationType[];
+  protected locationOptions = { level3: [], level2: [], level1: [] };
+  protected locationTypeToLabel = locationTypeToLabel;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.options
+      .flatMap((option: Location) => option.getLocationOptions())
+      .forEach((option: LocationOption) => {
+        if (!this.locationOptions[option.type].some((opt) => opt.id === option.id)) {
+          this.locationOptions[option.type].push(option);
+        }
+      });
+    this.labels = Object.keys(this.locationOptions).filter(
+      (key: LocationType) => this.locationOptions[key].length > 0
+    ) as LocationType[];
+  }
+}
diff --git a/src/messages.xlf b/src/messages.xlf
index ec439f0e92c..4757149f526 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -5753,6 +5753,43 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">27,30</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6780407325174304229" datatype="html">
+        <source>Locale</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modules/library/Location.ts</context>
+          <context context-type="linenumber">4</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="5911214550882917183" datatype="html">
+        <source>State</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modules/library/Location.ts</context>
+          <context context-type="linenumber">5</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/register/register-teacher-form/register-teacher-form.component.html</context>
+          <context context-type="linenumber">69,70</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/teacher/account/edit-profile/edit-profile.component.html</context>
+          <context context-type="linenumber">63,64</context>
+        </context-group>
+      </trans-unit>
+      <trans-unit id="516176798986294299" datatype="html">
+        <source>Country</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modules/library/Location.ts</context>
+          <context context-type="linenumber">6</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/register/register-teacher-form/register-teacher-form.component.html</context>
+          <context context-type="linenumber">78,79</context>
+        </context-group>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/teacher/account/edit-profile/edit-profile.component.html</context>
+          <context context-type="linenumber">72,73</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="1111779696786090540" datatype="html">
         <source>Copy Unit</source>
         <context-group purpose="location">
@@ -5868,25 +5905,32 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">104,106</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="4022066031214545422" datatype="html">
+        <source>Locations</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.html</context>
+          <context context-type="linenumber">138,140</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="6394457198241790363" datatype="html">
         <source>WISE Platform</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">48</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8239294784362097209" datatype="html">
         <source>Other Platform</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">53</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3437559734835046374" datatype="html">
         <source>NGSS</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">114</context>
+          <context context-type="linenumber">119</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.ts</context>
@@ -5897,7 +5941,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         <source>Common Core</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">115</context>
+          <context context-type="linenumber">120</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.ts</context>
@@ -5908,28 +5952,28 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         <source>Learning For Justice</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">116</context>
+          <context context-type="linenumber">121</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.ts</context>
           <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="7722179973203037469" datatype="html">
-        <source>&quot;Type&quot; indicates the platform on which a unit runs. &quot;WISE Platform&quot; units are created 
-      using the WISE authoring tool. Students use WISE accounts to complete lessons and teachers can review and grade 
-      work on the WISE platform. &quot;Other&quot; units are created using different platforms. Resources for these units 
+      <trans-unit id="3410262322826131465" datatype="html">
+        <source>&quot;Type&quot; indicates the platform on which a unit runs. &quot;WISE Platform&quot; units are created
+      using the WISE authoring tool. Students use WISE accounts to complete lessons and teachers can review and grade
+      work on the WISE platform. &quot;Other&quot; units are created using different platforms. Resources for these units
       are linked in the unit details.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">185,188</context>
+          <context context-type="linenumber">204,207</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3323880774610969171" datatype="html">
         <source>Unit Type</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-filters/library-filters.component.ts</context>
-          <context context-type="linenumber">192</context>
+          <context context-type="linenumber">211</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/assets/wise5/authoringTool/edit-unit-type/edit-unit-type.component.html</context>
@@ -6685,6 +6729,10 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
       </trans-unit>
       <trans-unit id="7011425206383801543" datatype="html">
         <source>more</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modules/shared/location-select-menu/location-select-menu.component.html</context>
+          <context context-type="linenumber">13,17</context>
+        </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/shared/select-menu/select-menu.component.html</context>
           <context context-type="linenumber">14,18</context>
@@ -7761,17 +7809,6 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">57,62</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="5911214550882917183" datatype="html">
-        <source>State</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/register/register-teacher-form/register-teacher-form.component.html</context>
-          <context context-type="linenumber">69,70</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/teacher/account/edit-profile/edit-profile.component.html</context>
-          <context context-type="linenumber">63,64</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="4756382175496941028" datatype="html">
         <source>State required</source>
         <context-group purpose="location">
@@ -7783,17 +7820,6 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">66,71</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="516176798986294299" datatype="html">
-        <source>Country</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/register/register-teacher-form/register-teacher-form.component.html</context>
-          <context context-type="linenumber">78,79</context>
-        </context-group>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/teacher/account/edit-profile/edit-profile.component.html</context>
-          <context context-type="linenumber">72,73</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="935361298840141106" datatype="html">
         <source>Country required</source>
         <context-group purpose="location">

From d0263010f21f6fd40851910312f28939210635ab Mon Sep 17 00:00:00 2001
From: Hiroki Terashima <honchikun@gmail.com>
Date: Fri, 29 Aug 2025 09:55:14 -0700
Subject: [PATCH 2/4] Show locations in unit details

---
 .../library-project-details.component.html    | 10 +++++++
 src/messages.xlf                              | 27 ++++++++++++-------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/src/app/modules/library/library-project-details/library-project-details.component.html b/src/app/modules/library/library-project-details/library-project-details.component.html
index dbee909a7c0..044984a80ba 100644
--- a/src/app/modules/library/library-project-details/library-project-details.component.html
+++ b/src/app/modules/library/library-project-details/library-project-details.component.html
@@ -148,6 +148,16 @@
           }
         </p>
       }
+      @if (project.metadata.locations?.length > 0) {
+        <p>
+          <strong i18n>Locations:</strong>
+          @for (location of project.metadata.locations; track location.id; let last = $last) {
+            {{ location.level3 ? location.level3 + ', ' : ''
+            }}{{ location.level2 ? location.level2 + ', ' : '' }}{{ location.level1 }}
+            {{ last ? '' : ' • ' }}
+          }
+        </p>
+      }
       @if (project.tags) {
         <unit-tags [tags]="project.tags" />
       }
diff --git a/src/messages.xlf b/src/messages.xlf
index 4757149f526..167134f8dff 100644
--- a/src/messages.xlf
+++ b/src/messages.xlf
@@ -283,7 +283,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">208,212</context>
+          <context context-type="linenumber">218,222</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/public-unit-type-selector/community-library-details.html</context>
@@ -6065,53 +6065,60 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
           <context context-type="linenumber">121,123</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="6644602411705618484" datatype="html">
+        <source>Locations:</source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
+          <context context-type="linenumber">153,154</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="8316240444829030702" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;{{ project.uri }}&quot; target=&quot;_blank&quot;&gt;"/>This unit<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> is a copy of <x id="START_LINK_1" equiv-text="&lt;a href=&quot;{{ parentProject.uri }}&quot; target=&quot;_blank&quot;&gt;"/><x id="INTERPOLATION" equiv-text="{{ parentProject.title }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> (used under <x id="START_LINK_2" equiv-text="&lt;a href=&quot;{{ licenseUrl }}&quot; target=&quot;_blank&quot;&gt;"/>CC BY-SA<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">164,166</context>
+          <context context-type="linenumber">174,176</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1086545303898503399" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;{{ project.uri }}&quot; target=&quot;_blank&quot;&gt;"/>This unit<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> is a copy of <x id="START_LINK_1" equiv-text="&lt;a href=&quot;{{ parentProject.uri }}&quot; target=&quot;_blank&quot;&gt;"/><x id="INTERPOLATION" equiv-text="{{ parentProject.title }}"/><x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> by <x id="INTERPOLATION_1" equiv-text="{{ parentAuthorsString }}"/> (used under <x id="START_LINK_2" equiv-text="&lt;a href=&quot;{{ licenseUrl }}&quot; target=&quot;_blank&quot;&gt;"/>CC BY-SA<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>).</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">170,173</context>
+          <context context-type="linenumber">180,183</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6204036064480384422" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;{{ project.uri }}&quot; target=&quot;_blank&quot;&gt;"/>This unit<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> is licensed under <x id="START_LINK_1" equiv-text="&lt;a href=&quot;{{ licenseUrl }}&quot; target=&quot;_blank&quot;&gt;"/>CC BY-SA<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/>. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">181,183</context>
+          <context context-type="linenumber">191,193</context>
         </context-group>
       </trans-unit>
       <trans-unit id="322569619342487074" datatype="html">
         <source><x id="START_LINK" ctype="x-a" equiv-text="&lt;a href=&quot;{{ project.uri }}&quot; target=&quot;_blank&quot;&gt;"/>This unit<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> is licensed under <x id="START_LINK_1" equiv-text="&lt;a href=&quot;{{ licenseUrl }}&quot; target=&quot;_blank&quot;&gt;"/>CC BY-SA<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/> by <x id="INTERPOLATION" equiv-text="{{ authorsString }}"/>. </source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">186,188</context>
+          <context context-type="linenumber">196,198</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7138375215763430051" datatype="html">
         <source>View License</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">193,197</context>
+          <context context-type="linenumber">203,207</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5937251202465808296" datatype="html">
         <source>More</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">201,207</context>
+          <context context-type="linenumber">211,217</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5537658691712388681" datatype="html">
         <source>Use with Class</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">217,222</context>
+          <context context-type="linenumber">227,232</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/teacher/create-run-dialog/create-run-dialog.component.html</context>
@@ -6122,7 +6129,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         <source>Preview</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">225,227</context>
+          <context context-type="linenumber">235,237</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/teacher/run-menu/run-menu.component.html</context>
@@ -6157,7 +6164,7 @@ Click &quot;Cancel&quot; to keep the invalid JSON open so you can fix it.</sourc
         <source>Unit Resources</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/modules/library/library-project-details/library-project-details.component.html</context>
-          <context context-type="linenumber">227,232</context>
+          <context context-type="linenumber">237,242</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3563179927132287246" datatype="html">

From c4f452b634c43783d5c609c7e925cfd60f2f3604 Mon Sep 17 00:00:00 2001
From: Jonathan Lim-Breitbart <breity10@gmail.com>
Date: Tue, 2 Sep 2025 13:01:57 -0700
Subject: [PATCH 3/4] Filter locations by name field instead of id

---
 src/app/domain/projectFilterValues.ts                           | 2 +-
 src/app/modules/library/Location.ts                             | 2 --
 .../library/library-filters/library-filters.component.html      | 2 +-
 .../location-select-menu/location-select-menu.component.ts      | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/app/domain/projectFilterValues.ts b/src/app/domain/projectFilterValues.ts
index 9a3a3e7017e..1f0b459a3c8 100644
--- a/src/app/domain/projectFilterValues.ts
+++ b/src/app/domain/projectFilterValues.ts
@@ -105,7 +105,7 @@ export class ProjectFilterValues {
         ?.map((location) => Object.assign(new Location(), location))
         .map((location) => location.getLocationOptions())
         .flat()
-        .some((locationOption) => this.locationValue.includes(locationOption.id))
+        .some((locationOption) => this.locationValue.includes(locationOption.name))
     );
   }
 
diff --git a/src/app/modules/library/Location.ts b/src/app/modules/library/Location.ts
index b3d80bc76ba..fd6c9e10980 100644
--- a/src/app/modules/library/Location.ts
+++ b/src/app/modules/library/Location.ts
@@ -7,13 +7,11 @@ export const locationTypeToLabel: { [key in LocationType]: string } = {
 };
 
 export class LocationOption {
-  id: string;
   name: string;
   type: LocationType;
   constructor(type: LocationType, name: string) {
     this.type = type;
     this.name = name;
-    this.id = `${locationTypeToLabel[type]}:${name}`;
   }
 }
 
diff --git a/src/app/modules/library/library-filters/library-filters.component.html b/src/app/modules/library/library-filters/library-filters.component.html
index d5b43c73c39..a7f5cbb888d 100644
--- a/src/app/modules/library/library-filters/library-filters.component.html
+++ b/src/app/modules/library/library-filters/library-filters.component.html
@@ -138,7 +138,7 @@ <h3 class="mat-subtitle-2" i18n>Filters</h3>
           placeholderText="Locations"
           [value]="filterValues.locationValue"
           (update)="filterUpdated($event, 'location')"
-          [valueProp]="'id'"
+          [valueProp]="'name'"
           [viewValueProp]="'name'"
           [multiple]="true"
         />
diff --git a/src/app/modules/shared/location-select-menu/location-select-menu.component.ts b/src/app/modules/shared/location-select-menu/location-select-menu.component.ts
index 28230ae521a..5fc1ade8149 100644
--- a/src/app/modules/shared/location-select-menu/location-select-menu.component.ts
+++ b/src/app/modules/shared/location-select-menu/location-select-menu.component.ts
@@ -24,7 +24,7 @@ export class LocationSelectMenuComponent extends SelectMenuComponent {
     this.options
       .flatMap((option: Location) => option.getLocationOptions())
       .forEach((option: LocationOption) => {
-        if (!this.locationOptions[option.type].some((opt) => opt.id === option.id)) {
+        if (!this.locationOptions[option.type].some((opt) => opt.name === option.name)) {
           this.locationOptions[option.type].push(option);
         }
       });

From 587819e884ddb8eea886869a8dfaf0df4f6d11e8 Mon Sep 17 00:00:00 2001
From: Jonathan Lim-Breitbart <breity10@gmail.com>
Date: Tue, 2 Sep 2025 13:03:01 -0700
Subject: [PATCH 4/4] Add location to hasFilters check and clear filters action

---
 src/app/domain/projectFilterValues.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/app/domain/projectFilterValues.ts b/src/app/domain/projectFilterValues.ts
index 1f0b459a3c8..154e253a212 100644
--- a/src/app/domain/projectFilterValues.ts
+++ b/src/app/domain/projectFilterValues.ts
@@ -57,7 +57,8 @@ export class ProjectFilterValues {
         this.disciplineValue.length +
         this.unitTypeValue.length +
         this.gradeLevelValue.length +
-        this.featureValue.length >
+        this.featureValue.length +
+        this.locationValue.length >
       0
     );
   }
@@ -70,6 +71,7 @@ export class ProjectFilterValues {
     this.searchValue = '';
     this.standardValue = [];
     this.unitTypeValue = [];
+    this.locationValue = [];
   }
 
   private matchesUnitType(project: LibraryProject): boolean {