Merge branch 'main' into feat/members-actions

Author: perryr16

src/@seed/components/page/page.component.html

@@ -3,7 +3,12 @@
     class="bg-card flex flex-0 flex-col border-b p-6 sm:flex-row sm:items-center sm:justify-between sm:px-10 sm:py-8 dark:bg-transparent"
   >
     <div class="min-w-0 flex-1">
-      <h2 class="truncate text-3xl font-extrabold capitalize leading-7 tracking-tight sm:leading-10 md:text-4xl">{{ config.title }}</h2>
+      <h2 class="truncate text-3xl font-extrabold capitalize leading-7 tracking-tight sm:leading-10 md:text-4xl">
+        @if (config.titleIcon) {
+          <mat-icon class="icon-size-6" [svgIcon]="config.titleIcon"></mat-icon>
+        }
+        {{ config.title }}
+      </h2>
     </div>
     <!-- Actions -->
     @if (config.action2) {

src/@seed/components/page/page.types.ts

@@ -6,4 +6,5 @@ export type Config = {
   action2Icon?: string;
   action2Text?: string;
   title: string;
+  titleIcon?: string;
 }

src/app/core/navigation/navigation.service.ts

@@ -103,7 +103,7 @@ export class NavigationService {
           id: 'organizations/members',
           link: '/organizations/members',
           title: 'Members',
-          icon: 'fa-solid:user',
+          icon: 'fa-solid:users',
           type: 'basic',
         },
       ],

src/app/modules/data/data.component.html

@@ -1,4 +1,12 @@
-<seed-page [config]="{ title: 'Data', action: createDataset, actionIcon: 'fa-solid:plus', actionText: 'Create Dataset' }">
+<seed-page
+  [config]="{
+    title: 'Data',
+    titleIcon: 'fa-solid:sitemap',
+    action: createDataset,
+    actionIcon: 'fa-solid:plus',
+    actionText: 'Create Dataset',
+  }"
+>
   <!-- Main -->
   <div class="flex-auto pt-4 sm:pt-6">
     <div class="mx-auto w-full max-w-screen-xl">

src/app/modules/organizations/access-level-tree/access-level-tree.component.html

@@ -1,3 +1,3 @@
-<seed-page [config]="{ title: 'Access Level Tree' }">
+<seed-page [config]="{ title: 'Access Level Tree', titleIcon: 'fa-solid:sitemap' }">
   <div>Access Level Tree Content</div>
 </seed-page>

src/app/modules/organizations/cycles/cycles.component.html

@@ -1,4 +1,13 @@
-<seed-page [config]="{ title: 'Cycles', action: createCycle, actionIcon: 'fa-solid:plus', actionText: 'Create Cycle' }" title="Cycles">
+<seed-page
+  [config]="{
+    title: 'Cycles',
+    titleIcon: 'fa-solid:calendar-days',
+    action: createCycle,
+    actionIcon: 'fa-solid:plus',
+    actionText: 'Create Cycle',
+  }"
+  title="Cycles"
+>
   <!-- Cycles Table -->
   <seed-page-table-container>
     <table class="mat-elevation-z8 w-full bg-transparent" mat-table matSort [dataSource]="cyclesDataSource" [trackBy]="trackByFn">

src/app/modules/organizations/data-quality/data-quality.component.ts

@@ -74,6 +74,7 @@ export class DataQualityComponent implements OnDestroy, OnInit {
     // remove create rule button if on the goal tab
     return {
       title: 'Data Quality',
+      titleIcon: 'fa-solid:flag',
       action: this.resetRules,
       actionIcon: 'fa-solid:rotate-left',
       actionText: 'Reset All Rules',

src/app/modules/organizations/derived-columns/derived-columns.component.html

@@ -1,5 +1,11 @@
 <seed-page
-  [config]="{ title: 'Derived Columns', action: createDerivedColumn, actionIcon: 'fa-solid:plus', actionText: 'Create a Derived Column' }"
+  [config]="{
+    title: 'Derived Columns',
+    titleIcon: 'fa-solid:calculator',
+    action: createDerivedColumn,
+    actionIcon: 'fa-solid:plus',
+    actionText: 'Create a Derived Column',
+  }"
   *transloco="let t"
 >
   <seed-page-inventory-tab [config]="{ tabs, action: toggleInventoryType.bind(this) }"></seed-page-inventory-tab>

src/app/modules/organizations/email-templates/email-templates.component.html

@@ -1,3 +1,3 @@
-<seed-page [config]="{ title: 'Email Templates' }">
+<seed-page [config]="{ title: 'Email Templates', titleIcon: 'fa-solid:envelope' }">
   <div>Email Templates Content</div>
 </seed-page>

src/app/modules/organizations/labels/labels.component.html

@@ -1,4 +1,6 @@
-<seed-page [config]="{ title: 'Labels', action: create, actionIcon: 'fa-solid:plus', actionText: 'Create Label' }">
+<seed-page
+  [config]="{ title: 'Labels', titleIcon: 'fa-solid:tags', action: create, actionIcon: 'fa-solid:plus', actionText: 'Create Label' }"
+>
   <seed-page-table-container>
     <table mat-table [dataSource]="labelsDataSource">
       <ng-container matColumnDef="label">

src/app/modules/organizations/settings/api-key/api-key.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: API Keys' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: API Keys' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/audit-template/audit-template.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: Audit Template' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: Audit Template' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="prose">

src/app/modules/organizations/settings/default-display-fields/default-display-fields.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: Default Display Fields' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: Default Display Fields' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/email/email.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: New User Email' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: New User Email' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/options/options.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: Options' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: Options' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/salesforce/salesforce.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: Salesforce Integration' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: Salesforce Integration' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/two-factor/two-factor.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: Require Two-Factor Authentication' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: Require Two-Factor Authentication' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/ubid/ubid.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: UBID Threshold' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: UBID Threshold' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">

src/app/modules/organizations/settings/units/units.component.html

@@ -1,4 +1,4 @@
-<seed-page [config]="{ title: 'Organization Settings: Display Units' }">
+<seed-page [config]="{ titleIcon: 'fa-solid:gears', title: 'Organization Settings: Display Units' }">
   @if (organization) {
     <div class="flex-auto p-6 sm:p-10" *transloco="let t">
       <div class="max-w-2xl">