minor fix to ensure tabs change

2sic/2sxc#2927

Author: iJungleboy

projects/quick-dialog/src/app/template-picker/content-type.ts

@@ -11,7 +11,7 @@ export class ContentType {
     //  * 2022-11-04 2dm - doesn't seem to be added in the UI either, so skip / remove this ???
     //  * 2022-11-04 2dm disabled, think it's never used
     //  */
-    TemplateId: number;
+    // TemplateId: number;
     IsDefault = false;
 }
 

projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts

@@ -39,8 +39,8 @@ export class ContentTypesProcessor {
     contentTypes
       // 2022-11-04 2dm disabled, think it's never used
       // 2022-11-11 trying to fix another issue....
-      .filter(c => (currentTemplate?.TemplateId === c.TemplateId) || (c.StaticName === currentType?.StaticName))
-      // .filter(c => (c.StaticName === currentType?.StaticName && c.StaticName !== undefined))
+      // .filter(c => (currentTemplate?.TemplateId === c.TemplateId) || (c.StaticName === currentType?.StaticName))
+      .filter(c => (c.StaticName === currentType?.StaticName && c.StaticName !== undefined))
       .forEach(c => c.IsHidden = false);
     // console.log('2dm after', contentTypes);
     return contentTypes;

projects/quick-dialog/src/app/template-picker/template-picker.component.html

@@ -9,7 +9,7 @@ <h4>Debug 2sxc 14 Quick Dialog</h4>
       <li>Apps: {{ (apps$ | async)?.length }}, current: {{app?.AppId }} </li>
       <li>Templates: {{templates?.length}}, current: {{template?.TemplateId}}</li>
       <li>Config: isContent='{{isContent}}' Ready: {{ready}} </li>
-      <li>Tab to show: '{{tabIndex}}' / {{tab$ | async}} / preventTypeSwitch '{{preventTypeSwitch}}' / preventAppSwitch '{{preventAppSwitch}}'</li>
+      <li>Tab to show: '{{tabIndex}}' / preventTypeSwitch '{{preventTypeSwitch}}' / preventAppSwitch '{{preventAppSwitch}}'</li>
       <li>installerNeeded: {{installerNeeded}}, isInnerContent: {{isInnerContent}}, installerShow: {{installerShow}}, showInstallAndAllApps: {{showInstallAndAllApps}}</li>
     </ul>
   </div>
@@ -31,7 +31,7 @@ <h4>Debug 2sxc 14 Quick Dialog</h4>
     </div>
 
     <!-- tabs -->
-    <mat-tab-group [selectedIndex]="tab$ | async">
+    <mat-tab-group [selectedIndex]="tabIndex">
       <mat-tab>
         <ng-template mat-tab-label>
           {{(isContent

projects/quick-dialog/src/app/template-picker/template-picker.component.ts

@@ -49,7 +49,6 @@ export class TemplatePickerComponent implements OnInit {
 
   /** Tab-id, when we set it, the tab switches */
   tabIndex = 0;
-  tab$ = new BehaviorSubject<number>(0);
 
   /** Indicate if the user is allowed to change content-types or not */
   preventTypeSwitch: boolean;
@@ -109,6 +108,7 @@ export class TemplatePickerComponent implements OnInit {
 
     this.boot(dashInfo);
     if (debug) this.debugObservables();
+    console.log('2dm - CONSTRUCTOR');
   }
 
   ngOnInit(): void {
@@ -133,10 +133,12 @@ export class TemplatePickerComponent implements OnInit {
   }
 
   private debugObservables() {
+    console.log('debugObservables');
+    // this.tab$.subscribe(t => log.add(`tab changed to ${t}`));
+
     if (!DebugConfig.picker.streams) return;
     this.loading$.subscribe(l => log.add(`quick-dialog loading$:${l}`));
     this.ready$.subscribe(r => log.add(`quick-dialog ready$:${r}`));
-    this.tab$.subscribe(t => log.add(`tab changed to ${t}`));
   }
 
   /**
@@ -292,12 +294,11 @@ export class TemplatePickerComponent implements OnInit {
     const msg = `switchTab(${message})`;
     log.add(msg);
     this.tabIndex = 1;
-    this.tab$.next(1);
+    this.cdRef.detectChanges();
     // repeat after delay because of a bug in the tabs-updating (unclear why...)
-    timer(100).toPromise().then(_ => {
-      this.tab$.next(1);
-      return this.tabIndex = 1;
-    });
+    // timer(100).toPromise().then(_ => {
+    //   return this.tabIndex = 1;
+    // });
   }