Fix init help order

paulscherrerinstitute · Aug 27, 2024 · c482767 · c482767
1 parent 604e546
commit c482767
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/scilog/src/app/logbook/core/search-window/search-window.component.spec.ts b/scilog/src/app/logbook/core/search-window/search-window.component.spec.ts
@@ -145,7 +145,7 @@ describe('SearchWindowComponent', () => {
       expect(component["_prepareConfig"]()).toEqual(t? t.configOut: defaultConfig);
       if (t)
         expect(component.searchStringFromConfig).toEqual(t.searchStringFromConfig);
-      expect(component.tags).toEqual(t?.tagsOut ?? [])
+      expect(component.tags).toEqual(t?.tagsOut ?? ['alignment'])
     });
   });
 

diff --git a/scilog/src/app/logbook/core/search-window/search-window.component.ts b/scilog/src/app/logbook/core/search-window/search-window.component.ts
@@ -48,10 +48,9 @@ export class SearchWindowComponent implements OnInit {
   async ngOnInit(): Promise<void> {
     this.searchString = this.searched;
     this.logbookId = this.logbookInfo?.logbookInfo?.id;
-    this.tags = await this.tagService.getTags();
+    await this._initialize_help();
     this.config = this._prepareConfig();
 
-    await this._initialize_help();
     this.subscriptions.push(this.hotkeys.addShortcut({ keys: 'esc', description: { label: 'Close search', group: "General" } }).subscribe(() => {
       this.closeSearch();
     }));
@@ -85,17 +84,10 @@ export class SearchWindowComponent implements OnInit {
   private async _initialize_help() {
 
     this._sample_user = this.userPreferences.userInfo.username;
-    // roles.find((val)=>{
-    //   if ((val.length == 6)&&(val.substring(0,1)=="p")){
-    //     return true;
-    //   }
-    //   return false;
-    // })
     if (typeof this._sample_user == 'undefined') {
       this._sample_user = "p12345";
     }
     if (!this.logbookId) return
-    this.tags = this.tags.length > 0? this.tags: (await this.tagService?.getTags());
     if (this.tags?.length == 0) {
       this.tags = ["alignment"];
     }