fixed comments :removed unwanted test and fixed settings file

Author: HishamHR5

src/app/pages/settings/settings.component.html

@@ -165,11 +165,11 @@ <h2>Terminology</h2>
     </p>
     <div class="terminology-grid">
       <div class="terminology-row">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" floatLabel="always">
           <mat-label>Team (singular)</mat-label>
           <input
             matInput
-            placeholder="e.g. App"
+            [placeholder]="getTeamSingularPlaceholder()"
             name="customTeamLabel"
             [(ngModel)]="customTeamLabel"
             (ngModelChange)="onTeamLabelChange()" />
@@ -185,11 +185,11 @@ <h2>Terminology</h2>
         </mat-form-field>
       </div>
       <div class="terminology-row">
-        <mat-form-field appearance="fill">
+        <mat-form-field appearance="fill" floatLabel="always">
           <mat-label>Group (singular)</mat-label>
           <input
             matInput
-            placeholder="e.g. Portfolio"
+            [placeholder]="getGroupSingularPlaceholder()"
             name="customGroupLabel"
             [(ngModel)]="customGroupLabel"
             (ngModelChange)="onGroupLabelChange()" />

src/app/pages/settings/settings.component.spec.ts

@@ -49,12 +49,16 @@ describe('SettingsComponent', () => {
       'getGroupLabelPlural',
       'setTeamLabel',
       'setGroupLabel',
+      'getMetaTeamLabel',
+      'getMetaGroupLabel',
       'initFromMeta',
     ]);
     settingsService.getTeamLabel.and.returnValue('Team');
     settingsService.getTeamLabelPlural.and.returnValue('Teams');
     settingsService.getGroupLabel.and.returnValue('Group');
     settingsService.getGroupLabelPlural.and.returnValue('Groups');
+    settingsService.getMetaTeamLabel.and.returnValue({ singular: 'Team', plural: 'Teams' });
+    settingsService.getMetaGroupLabel.and.returnValue({ singular: 'Group', plural: 'Groups' });
     modalComponent = jasmine.createSpyObj('ModalMessageComponent', ['openDialog']);
 
     await TestBed.configureTestingModule({

src/app/pages/settings/settings.component.ts

@@ -61,9 +61,9 @@ export class SettingsComponent implements OnInit {
   ];
   selectedDateFormat: string = this.BROWSER_LOCALE;
 
-  customTeamLabel: string = 'Team';
+  customTeamLabel: string = '';
   customTeamLabelPlural: string = '';
-  customGroupLabel: string = 'Group';
+  customGroupLabel: string = '';
   customGroupLabelPlural: string = '';
 
   // GitHub release check state
@@ -90,6 +90,7 @@ export class SettingsComponent implements OnInit {
       .then((dataStore: DataStore) => {
         this.setYamlData(dataStore);
         this.updateProgressDefinitionsForm();
+        this.initLabels(); // Re-read labels now that meta.yaml is loaded
       })
       .catch(err => {
         this.modal.openDialog(new DialogInfo(err.message, 'An error occurred'));
@@ -150,19 +151,7 @@ export class SettingsComponent implements OnInit {
 
   initialize(): void {
     this.selectedDateFormat = this.settings.getDateFormat() || this.BROWSER_LOCALE;
-    this.customTeamLabel = this.settings.getTeamLabel();
-    this.customTeamLabelPlural = this.settings.getTeamLabelPlural();
-    this.customGroupLabel = this.settings.getGroupLabel();
-    this.customGroupLabelPlural = this.settings.getGroupLabelPlural();
-
-    // If the plural is just the auto-generated default (singular + 's'),
-    // leave the field empty so the dynamic placeholder shows instead.
-    if (this.customTeamLabelPlural === this.customTeamLabel + 's') {
-      this.customTeamLabelPlural = '';
-    }
-    if (this.customGroupLabelPlural === this.customGroupLabel + 's') {
-      this.customGroupLabelPlural = '';
-    }
+    this.initLabels();
 
     // Init dates
     let date: Date = new Date();
@@ -176,6 +165,29 @@ export class SettingsComponent implements OnInit {
     }
   }
 
+  /**
+   * Read current labels from the service into the component fields.
+   * Called both on init and after meta.yaml loads.
+   */
+  initLabels(): void {
+    const teamLabel = this.settings.getTeamLabel();
+    const teamPlural = this.settings.getTeamLabelPlural();
+    const groupLabel = this.settings.getGroupLabel();
+    const groupPlural = this.settings.getGroupLabelPlural();
+
+    // Show the value in the field only if it differs from the meta.yaml default.
+    // Otherwise, leave the field empty and let the placeholder show the default.
+    const metaTeam = this.settings.getMetaTeamLabel();
+    const metaGroup = this.settings.getMetaGroupLabel();
+
+    this.customTeamLabel = teamLabel === metaTeam.singular ? '' : teamLabel;
+    this.customGroupLabel = groupLabel === metaGroup.singular ? '' : groupLabel;
+
+    // For plural: show empty if it matches the auto-generated default (singular + 's')
+    this.customTeamLabelPlural = teamPlural === teamLabel + 's' ? '' : teamPlural;
+    this.customGroupLabelPlural = groupPlural === groupLabel + 's' ? '' : groupPlural;
+  }
+
   setYamlData(dataStore: DataStore): void {
     this.dataStoreMaxLevel = dataStore.getMaxLevel();
     this.selectedMaxLevel = this.settings.getMaxLevel() || this.dataStoreMaxLevel;
@@ -198,38 +210,49 @@ export class SettingsComponent implements OnInit {
   }
 
   onTeamLabelChange(): void {
-    this.settings.setTeamLabel(this.customTeamLabel, this.customTeamLabelPlural);
-    // Update plural placeholder when singular changes
-    if (!this.customTeamLabelPlural || this.customTeamLabelPlural === this.customTeamLabel + 's') {
+    // If cleared, revert to meta.yaml default
+    const effective = this.customTeamLabel || this.settings.getMetaTeamLabel().singular;
+    this.settings.setTeamLabel(effective, this.customTeamLabelPlural);
+    // Clear plural so placeholder updates
+    if (!this.customTeamLabelPlural || this.customTeamLabelPlural === effective + 's') {
       this.customTeamLabelPlural = '';
     }
   }
 
   onTeamLabelPluralChange(): void {
-    this.settings.setTeamLabel(this.customTeamLabel, this.customTeamLabelPlural);
+    const effective = this.customTeamLabel || this.settings.getMetaTeamLabel().singular;
+    this.settings.setTeamLabel(effective, this.customTeamLabelPlural);
   }
 
   onGroupLabelChange(): void {
-    this.settings.setGroupLabel(this.customGroupLabel, this.customGroupLabelPlural);
-    // Update plural placeholder when singular changes
-    if (
-      !this.customGroupLabelPlural ||
-      this.customGroupLabelPlural === this.customGroupLabel + 's'
-    ) {
+    // If cleared, revert to meta.yaml default
+    const effective = this.customGroupLabel || this.settings.getMetaGroupLabel().singular;
+    this.settings.setGroupLabel(effective, this.customGroupLabelPlural);
+    // Clear plural so placeholder updates
+    if (!this.customGroupLabelPlural || this.customGroupLabelPlural === effective + 's') {
       this.customGroupLabelPlural = '';
     }
   }
 
   onGroupLabelPluralChange(): void {
-    this.settings.setGroupLabel(this.customGroupLabel, this.customGroupLabelPlural);
+    const effective = this.customGroupLabel || this.settings.getMetaGroupLabel().singular;
+    this.settings.setGroupLabel(effective, this.customGroupLabelPlural);
+  }
+
+  getTeamSingularPlaceholder(): string {
+    return this.settings.getMetaTeamLabel().singular || 'Team';
+  }
+
+  getGroupSingularPlaceholder(): string {
+    return this.settings.getMetaGroupLabel().singular || 'Group';
   }
 
   getTeamPluralPlaceholder(): string {
-    return (this.customTeamLabel || 'Team') + 's';
+    return (this.customTeamLabel || this.settings.getMetaTeamLabel().singular || 'Team') + 's';
   }
 
   getGroupPluralPlaceholder(): string {
-    return (this.customGroupLabel || 'Group') + 's';
+    return (this.customGroupLabel || this.settings.getMetaGroupLabel().singular || 'Group') + 's';
   }
 
   onMaxLevelChange(value: number | null): void {

src/app/service/settings/settings.service.spec.ts

@@ -61,33 +61,6 @@ describe('SettingsService', () => {
     });
   });
 
-  describe('migrateOldKeys', () => {
-    it('should migrate legacy team label key', () => {
-      localStorage.clear();
-      localStorage.setItem('settings.teamLabel', JSON.stringify('Client'));
-      // Create a new service instance to trigger migration
-      const freshService = new SettingsService();
-      expect(localStorage.getItem('settings.teamLabel')).toBeNull();
-      expect(freshService.getTeamLabel()).toBe('Client');
-    });
-
-    it('should migrate legacy group label key', () => {
-      localStorage.clear();
-      localStorage.setItem('settings.groupLabel', JSON.stringify('Portfolio'));
-      const freshService = new SettingsService();
-      expect(localStorage.getItem('settings.groupLabel')).toBeNull();
-      expect(freshService.getGroupLabel()).toBe('Portfolio');
-    });
-
-    it('should not overwrite existing consolidated key', () => {
-      localStorage.clear();
-      localStorage.setItem('settings.labels', JSON.stringify({ team: 'Existing', group: '' }));
-      localStorage.setItem('settings.teamLabel', JSON.stringify('ShouldBeIgnored'));
-      const freshService = new SettingsService();
-      expect(freshService.getTeamLabel()).toBe('Existing');
-    });
-  });
-
   describe('initFromMeta', () => {
     it('should set meta defaults for team and group', () => {
       service.initFromMeta({
@@ -162,22 +135,7 @@ describe('SettingsService', () => {
     });
   });
 
-  describe('General Settings Operations', () => {
-    it('should handle empty string settings', () => {
-      service.saveSettings('test.key', '');
-      expect(localStorage.getItem('test.key')).toBeNull();
-    });
-
-    it('should handle empty array settings', () => {
-      service.saveSettings('test.key', []);
-      expect(localStorage.getItem('test.key')).toBeNull();
-    });
-
-    it('should handle empty object settings', () => {
-      service.saveSettings('test.key', {});
-      expect(localStorage.getItem('test.key')).toBeNull();
-    });
-
+  describe('Settings helpers', () => {
     it('should properly store and retrieve number settings', () => {
       localStorage.setItem('test.key', '42');
       expect(service.getSettingsNumber('test.key')).toBe(42);
@@ -186,15 +144,5 @@ describe('SettingsService', () => {
     it('should return null for non-existent number settings', () => {
       expect(service.getSettingsNumber('nonexistent.key')).toBeNull();
     });
-
-    it('should handle complex object settings', () => {
-      const complexObj = {
-        key1: 'value1',
-        key2: 42,
-        nested: { prop: true },
-      };
-      service.saveSettings('test.complex', complexObj);
-      expect(service.getSettings('test.complex')).toEqual(complexObj);
-    });
   });
 });

src/app/service/settings/settings.service.ts

@@ -19,10 +19,6 @@ export class SettingsService {
   private readonly KEY_MAX_LEVEL = 'settings.maxlevel';
   private readonly KEY_LABELS = 'settings.labels';
 
-  // Legacy keys for migration
-  private readonly LEGACY_KEY_TEAM_LABEL = 'settings.teamLabel';
-  private readonly LEGACY_KEY_GROUP_LABEL = 'settings.groupLabel';
-
   private dateformat: string | null = null;
   private maxLevel: number | null = null;
   private _labels: Labels | null = null;
@@ -32,9 +28,7 @@ export class SettingsService {
   private _metaGroup: LabelParts = { singular: 'Group', plural: 'Groups' };
   private _metaInitialized: boolean = false;
 
-  constructor() {
-    this.migrateOldKeys();
-  }
+  constructor() {}
 
   // --- Meta initialization ---
 
@@ -53,6 +47,16 @@ export class SettingsService {
     this._labels = null;
   }
 
+  // --- Meta defaults (for placeholder display) ---
+
+  getMetaTeamLabel(): LabelParts {
+    return this._metaTeam;
+  }
+
+  getMetaGroupLabel(): LabelParts {
+    return this._metaGroup;
+  }
+
   // --- Label parsing ---
 
   /**
@@ -85,45 +89,6 @@ export class SettingsService {
     return `${singular}|${plural}`;
   }
 
-  // --- Migration ---
-
-  /**
-   * Migrate old separate localStorage keys into the consolidated settings.labels key.
-   */
-  migrateOldKeys(): void {
-    const oldTeam = localStorage.getItem(this.LEGACY_KEY_TEAM_LABEL);
-    const oldGroup = localStorage.getItem(this.LEGACY_KEY_GROUP_LABEL);
-
-    if (oldTeam !== null || oldGroup !== null) {
-      // Only migrate if we don't already have the consolidated key
-      const existing = localStorage.getItem(this.KEY_LABELS);
-      if (existing === null) {
-        const labels: Labels = { team: '', group: '' };
-        if (oldTeam !== null) {
-          try {
-            labels.team = JSON.parse(oldTeam);
-          } catch {
-            labels.team = oldTeam;
-          }
-        }
-        if (oldGroup !== null) {
-          try {
-            labels.group = JSON.parse(oldGroup);
-          } catch {
-            labels.group = oldGroup;
-          }
-        }
-        // Only save if there's actually custom data
-        if (labels.team || labels.group) {
-          localStorage.setItem(this.KEY_LABELS, JSON.stringify(labels));
-        }
-      }
-      // Remove legacy keys
-      localStorage.removeItem(this.LEGACY_KEY_TEAM_LABEL);
-      localStorage.removeItem(this.LEGACY_KEY_GROUP_LABEL);
-    }
-  }
-
   // --- Labels (consolidated) ---
 
   private loadLabels(): Labels {