From 6f1694c1290abebb9d3d5561dd5d6a78e5675e01 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Thu, 10 Nov 2022 17:10:12 +0100
Subject: [PATCH 1/5] version bump 14.13

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d6e5df325..7e375fee9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "2sxc-ui",
-  "version": "14.12.00",
+  "version": "14.13.00",
   "description": "2sxc UI - the JS UI of 2sxc",
   "scripts": {
     "release-all": "npm run js2sxc && npm run inpage && npm run snippets && npm run quickdialog && npm run turn-on",

From 0ca74e54bb34f975682859a7ae6d7bded54f1b4e Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 11 Nov 2022 11:49:25 +0100
Subject: [PATCH 2/5] version bump to 14.12.01

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7e375fee9..4f870a321 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "2sxc-ui",
-  "version": "14.13.00",
+  "version": "14.12.01",
   "description": "2sxc UI - the JS UI of 2sxc",
   "scripts": {
     "release-all": "npm run js2sxc && npm run inpage && npm run snippets && npm run quickdialog && npm run turn-on",

From a875ad17755f00309077670836e3d182261a021f Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 11 Nov 2022 17:00:01 +0100
Subject: [PATCH 3/5] trying to fix tab selection - WIP

---
 projects/quick-dialog/angular.json            |   1 +
 projects/quick-dialog/package-lock.json       | 206 +++++-------------
 .../src/app/template-picker/content-type.ts   |   2 +-
 .../template-picker/current-data.service.ts   |  53 +++--
 .../data/content-types-processor.service.ts   |  14 +-
 .../template-picker.component.html            |  11 +-
 .../template-picker.component.ts              |  54 +++--
 projects/quick-dialog/src/i18n/de.json        |   2 +
 projects/quick-dialog/src/i18n/en.json        |   2 +
 9 files changed, 147 insertions(+), 198 deletions(-)

diff --git a/projects/quick-dialog/angular.json b/projects/quick-dialog/angular.json
index 3b5ca01c0..977c2e134 100644
--- a/projects/quick-dialog/angular.json
+++ b/projects/quick-dialog/angular.json
@@ -58,6 +58,7 @@
             },
             "development": {
               "optimization": false,
+              "outputHashing": "none",
               "sourceMap": true,
               "namedChunks": false,
               "extractLicenses": true,
diff --git a/projects/quick-dialog/package-lock.json b/projects/quick-dialog/package-lock.json
index a0444d5b3..9036a5023 100644
--- a/projects/quick-dialog/package-lock.json
+++ b/projects/quick-dialog/package-lock.json
@@ -677,9 +677,9 @@
       }
     },
     "node_modules/@angular-devkit/build-angular/node_modules/babel-loader/node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -6539,33 +6539,6 @@
         "node": ">=8.9"
       }
     },
-    "node_modules/adjust-sourcemap-loader/node_modules/json5": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-      "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/adjust-sourcemap-loader/node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/agent-base": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
@@ -7959,35 +7932,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/json5": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-      "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-      "dev": true,
-      "dependencies": {
-        "minimist": "^1.2.5"
-      },
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/copy-webpack-plugin/node_modules/loader-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-      "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-      "dev": true,
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/copy-webpack-plugin/node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -10448,6 +10392,30 @@
         "node": ">=6.11.5"
       }
     },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/loader-utils/node_modules/json5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -10837,9 +10805,9 @@
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
     },
     "node_modules/minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -10850,7 +10818,8 @@
     "node_modules/minimist": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
     },
     "node_modules/minipass": {
       "version": "3.1.6",
@@ -12620,30 +12589,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/resolve-url-loader/node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/resolve-url-loader/node_modules/loader-utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-      "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-      "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
-      },
-      "engines": {
-        "node": ">=8.9.0"
-      }
-    },
     "node_modules/resolve-url-loader/node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -14838,9 +14783,9 @@
           },
           "dependencies": {
             "loader-utils": {
-              "version": "2.0.2",
-              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-              "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
+              "version": "2.0.4",
+              "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+              "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
               "requires": {
                 "big.js": "^5.2.2",
                 "emojis-list": "^3.0.0",
@@ -18865,26 +18810,6 @@
       "requires": {
         "loader-utils": "^2.0.0",
         "regex-parser": "^2.2.11"
-      },
-      "dependencies": {
-        "json5": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
-          "integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        }
       }
     },
     "agent-base": {
@@ -19957,26 +19882,6 @@
             "is-extglob": "^2.1.1"
           }
         },
-        "json5": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-          "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.5"
-          }
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
         "normalize-path": {
           "version": "3.0.0",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -21709,6 +21614,23 @@
       "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
       "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg=="
     },
+    "loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "requires": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "dependencies": {
+        "json5": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
+          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
+        }
+      }
+    },
     "locate-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
@@ -22008,9 +21930,9 @@
       "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
     },
     "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "requires": {
         "brace-expansion": "^1.1.7"
       }
@@ -22018,7 +21940,8 @@
     "minimist": {
       "version": "1.2.6",
       "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
-      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="
+      "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
+      "dev": true
     },
     "minipass": {
       "version": "3.1.6",
@@ -23361,21 +23284,6 @@
         "source-map": "0.6.1"
       },
       "dependencies": {
-        "json5": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-          "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="
-        },
-        "loader-utils": {
-          "version": "2.0.2",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz",
-          "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
diff --git a/projects/quick-dialog/src/app/template-picker/content-type.ts b/projects/quick-dialog/src/app/template-picker/content-type.ts
index f699eee09..642b6885e 100644
--- a/projects/quick-dialog/src/app/template-picker/content-type.ts
+++ b/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;
 }
 
diff --git a/projects/quick-dialog/src/app/template-picker/current-data.service.ts b/projects/quick-dialog/src/app/template-picker/current-data.service.ts
index a3ca87c1a..02eac07d2 100644
--- a/projects/quick-dialog/src/app/template-picker/current-data.service.ts
+++ b/projects/quick-dialog/src/app/template-picker/current-data.service.ts
@@ -57,39 +57,50 @@ export class CurrentDataService {
     // app-stream should contain selected app, once the ID is known - or null
     this.app$ = combineLatest([
       this.api.apps$,
-      this.appId$]).pipe(map(([apps, appId]) => apps.find(a => a.AppId === appId)));
+      this.appId$
+    ]).pipe(map(([apps, appId]) => apps.find(a => a.AppId === appId)));
 
     // current type should be either the initial type, or a manually selected type
-    const initialType$ = combineLatest([this.initialTypeId$, this.api.contentTypes$])
-      .pipe(map(([typeId, all]) => ContentTypesProcessor.findContentTypesById(all, typeId)));
+    const initialType$ = combineLatest([
+      this.initialTypeId$,
+      this.api.contentTypes$
+    ]).pipe(map(([typeId, all]) => ContentTypesProcessor.findContentTypesById(all, typeId)));
+
     this.type$ = merge(initialType$, this.selectedType$).pipe(
       startWith(null as ContentType),
-      share());
+      share()
+    );
 
     // the templates-list is always filtered by the currently selected type
-    this.templates$ = combineLatest([this.api.templates$, this.type$])
-      .pipe(map(([all, current]) => this.findTemplatesForTypeOrAll(all, current)))
-      .pipe(startWith(new Array<Template>()));
+    this.templates$ = combineLatest([
+      this.api.templates$,
+      this.type$
+    ]).pipe(
+      map(([all, current]) => this.findTemplatesForTypeOrAll(all, current)),
+      startWith(new Array<Template>())
+    );
 
     // the current template is either the last selected, or auto-selected when conditions change
     const initialTemplate$ = combineLatest([
       this.initialTemplateId$,
-      this.api.templates$])
-      .pipe(
+      this.api.templates$
+    ]).pipe(
         map(([id, templates]) => templates.find(t => t.TemplateId === id)),
         filter(t => t != null), // only allow new values which are not null, to guarantee later template$ updates don't affect this
         startWith(null as Template),
-        share());
+        share()
+      );
 
     const selected$ = merge(initialTemplate$, this.selectedTemplate$.pipe(filter(t => t !== null)));
     this.template$ = combineLatest([
       selected$,
       this.templates$,
       this.type$,
-      this.app$]).pipe(
-        map(([selected, templates, type, app]) => TemplateProcessor.pickSelected(selected, templates, type, app)),
-        startWith(null as Template),
-        share(),
+      this.app$
+    ]).pipe(
+      map(([selected, templates, type, app]) => TemplateProcessor.pickSelected(selected, templates, type, app)),
+      startWith(null as Template),
+      share(),
       );
 
     // construct list of relevant types for the UI
@@ -97,8 +108,11 @@ export class CurrentDataService {
       this.api.contentTypes$,
       this.type$,
       this.api.templates$,
-      this.template$])
-      .pipe(map(([types, type, templates, template]) => this.ctProcessor.buildList(types, type, templates, template)));
+      this.template$
+    ]).pipe(
+      map(([types, type, templates, template]) => this.ctProcessor.buildList(types, type, templates, template)),
+      share()
+    );
   }
 
   init(config: IQuickDialogConfig): Observable<boolean> {
@@ -120,8 +134,11 @@ export class CurrentDataService {
       startWith(!config.templateId)
     );
 
-    const loadAll$ = combineLatest([appReady$, templReady$, typeReady$])
-      .pipe(map(set => set[0] && set[1] && set[2]));
+    const loadAll$ = combineLatest([
+      appReady$,
+      templReady$,
+      typeReady$
+    ]).pipe(map(set => set[0] && set[1] && set[2]));
 
     this.initLogging(appReady$, typeReady$, templReady$, loadAll$);
 
diff --git a/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts b/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
index cb01bf12e..1283c40a6 100644
--- a/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
+++ b/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
@@ -33,14 +33,14 @@ export class ContentTypesProcessor {
    * Ensure current content-type is visible, just in case it's configured as hidden
    */
   private unhideSelectedType(contentTypes: ContentType[], currentType: ContentType, currentTemplate: Template): ContentType[] {
-    // console.log('2dm before', JSON.parse(JSON.stringify(contentTypes)));
-    // console.log('2dm current T', currentTemplate?.TemplateId);
-    // console.log('2dm currentType Static', currentType?.StaticName);
+    console.log('2dm before', JSON.parse(JSON.stringify(contentTypes)));
+    console.log('2dm current T', currentTemplate?.TemplateId);
+    console.log('2dm currentType Static', currentType?.StaticName);
     contentTypes
-      .filter(c => // 2022-11-04 2dm disabled, think it's never used (currentTemplate?.TemplateId === c.TemplateId && c.TemplateId !== undefined)
-        // ||
-        (c.StaticName === currentType?.StaticName && c.StaticName !== undefined)
-      )
+      // 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))
       .forEach(c => c.IsHidden = false);
     // console.log('2dm after', contentTypes);
     return contentTypes;
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.html b/projects/quick-dialog/src/app/template-picker/template-picker.component.html
index 703beecc2..9d928086d 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.html
+++ b/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}}' / preventTypeSwitch '{{preventTypeSwitch}}' / preventAppSwitch '{{preventAppSwitch}}'</li>
+      <li>Tab to show: '{{tabIndex}}' / {{tab$ | async}} / 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)]="tabIndex">
+    <mat-tab-group [selectedIndex]="tab$ | async">
       <mat-tab>
         <ng-template mat-tab-label>
           {{(isContent
@@ -87,8 +87,11 @@ <h4>Debug 2sxc 14 Quick Dialog</h4>
       </mat-tab>
 
       <!-- template selection after app/content-type selection -->
-      <mat-tab *ngIf="isContent ? contentType : app" [label]="('TemplatePicker.ChangeView' | translate) + ' (' + templates.length + ')'">
-        <div class="tiles" [ngClass]="{ 'show-installer': installerShow }">
+      <mat-tab [label]="('TemplatePicker.ChangeView' | translate) + ' (' + templates.length + ')'">
+        <div *ngIf="!(isContent ? contentType : app)">
+          &nbsp; &nbsp; &nbsp; {{ ("TemplatePicker.ViewNeeds" + (isContent ? "ContentType" : "App" )) | translate }}
+        </div>
+        <div *ngIf="isContent ? contentType : app" class="tiles" [ngClass]="{ 'show-installer': installerShow }">
           <mat-spinner class="templates-spinner" *ngIf="templatesLoading$ | async"></mat-spinner>
           <div class="tile"
             [ngClass]="{ active: template?.TemplateId === t.TemplateId }"
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.ts b/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
index a06449af6..6950a7830 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
+++ b/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
@@ -7,8 +7,8 @@ import { DebugConfig } from 'app/debug-config';
 import { IDialogFrameElement, IIFrameBridge, IQuickDialogConfig } from 'app/interfaces/shared';
 import { ContentType } from 'app/template-picker/content-type';
 import { Template } from 'app/template-picker/template';
-import { combineLatest, merge, Observable, timer } from 'rxjs';
-import { filter, map, skipUntil, startWith } from 'rxjs/operators';
+import { combineLatest, merge, Observable, timer, BehaviorSubject } from 'rxjs';
+import { filter, map, skipUntil, startWith, share } from 'rxjs/operators';
 import { BackendSettings } from '../core/backend-settings';
 import { CurrentDataService } from './current-data.service';
 import { ContentTypesProcessor } from './data/content-types-processor.service';
@@ -19,6 +19,8 @@ const log = parentLog.subLog('picker', DebugConfig.picker.enabled);
 
 const nameofTPC = nameofFactory<TemplatePickerComponent>();
 
+const debug = true;
+
 @Component({
   selector: 'app-template-picker',
   templateUrl: './template-picker.component.html',
@@ -47,6 +49,7 @@ 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;
@@ -105,7 +108,7 @@ export class TemplatePickerComponent implements OnInit {
     const dashInfo = this.bridge.getAdditionalDashboardConfig();
 
     this.boot(dashInfo);
-    this.debugObservables();
+    if (debug) this.debugObservables();
   }
 
   ngOnInit(): void {
@@ -131,28 +134,36 @@ export class TemplatePickerComponent implements OnInit {
 
   private debugObservables() {
     if (!DebugConfig.picker.streams) return;
-    this.loading$.subscribe(l => log.add(`loading$:${l}`));
-    this.ready$.subscribe(r => log.add(`ready$:${r}`));
+    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}`));
   }
 
   /**
    * wire up observables for this component
    */
+  private observablesAlreadyInitialized = false;
   private initObservables(initDone$: Observable<boolean>): void {
+    if (this.observablesAlreadyInitialized) return;
+    this.observablesAlreadyInitialized = true;
+
     const initTrue$ = initDone$.pipe(filter(t => !!t));
 
     // wire up basic observables
-    this.ready$ = combineLatest([this.api.ready$, this.loading$])
-      .pipe(map(([r, l]) => r && !l));
+    this.ready$ = combineLatest([this.api.ready$, this.loading$]).pipe(
+      map(([ready, loading]) => ready && !loading),
+      share()
+    );
 
     // all apps are the same as provided by the api
     this.apps$ = this.api.apps$;
 
     // if the content-type or app is set, switch tabs (ignore null/empty states)
-    const typeOrAppReady = merge(this.state.type$, this.state.app$)
-      .pipe(filter(t => !!t));
-    combineLatest([typeOrAppReady, initTrue$])
-      .subscribe(_ => this.switchTab());
+    const typeOrAppReady = merge(this.state.type$, this.state.app$).pipe(
+      filter(t => !!t),
+      share()
+    );
+    combineLatest([typeOrAppReady, initTrue$]).subscribe(_ => this.switchTab('type/app ready and init-true'));
 
     // once the data is known, check if installer is needed
     combineLatest([
@@ -161,8 +172,7 @@ export class TemplatePickerComponent implements OnInit {
       this.api.apps$,
       this.api.ready$.pipe(filter(r => !!r)),
       this.backendSettings.showAdvanced$
-    ])
-      .pipe(
+    ]).pipe(
         map(([templates, _, apps, _2, showAdv]) => {
           log.add('apps/templates loaded, will check if we should show installer');
           // Installer is needed on content without templates, or apps without any apps
@@ -245,7 +255,7 @@ export class TemplatePickerComponent implements OnInit {
    */
   selectApp(before: App, after: App): void {
     if (before && before.AppId === after.AppId) {
-      this.switchTab();
+      this.switchTab('select app');
     } else {
       this.updateApp(after);
       this.templateFilter = '';
@@ -257,7 +267,7 @@ export class TemplatePickerComponent implements OnInit {
    */
   selectContentType(before: ContentType, after: ContentType): void {
     if (before && before.StaticName === after.StaticName) {
-      this.switchTab();
+      this.switchTab('select template');
     } else {
       this.setContentType(after);
       this.templateFilter = '';
@@ -278,10 +288,16 @@ export class TemplatePickerComponent implements OnInit {
     this.state.activateType(contentType);
   }
 
-  switchTab() {
-    log.add('switchTab()');
-    // must delay change because of a bug in the tabs-updating
-    timer(100).toPromise().then(_ => this.tabIndex = 1);
+  switchTab(message: string) {
+    const msg = `switchTab(${message})`;
+    log.add(msg);
+    this.tabIndex = 1;
+    this.tab$.next(1);
+    // 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;
+    });
   }
 
 
diff --git a/projects/quick-dialog/src/i18n/de.json b/projects/quick-dialog/src/i18n/de.json
index 7e37c4f5d..80e7474fd 100644
--- a/projects/quick-dialog/src/i18n/de.json
+++ b/projects/quick-dialog/src/i18n/de.json
@@ -2,6 +2,8 @@
   "TemplatePicker": {
     "AppPickerDefault": "App auswählen",
     "ContentTypePickerDefault": "Inhaltstyp auswählen",
+    "ViewNeedsContentType": "Bitte wähle zuerst einen Inhaltstyp",
+    "ViewNeedsApp": "Bitte wähle zuerst ein App",
     "LayoutElement": "Design-Element",
     "ChangeView": "Darstellung anpassen",
 
diff --git a/projects/quick-dialog/src/i18n/en.json b/projects/quick-dialog/src/i18n/en.json
index 1887522cc..a40a7cd81 100644
--- a/projects/quick-dialog/src/i18n/en.json
+++ b/projects/quick-dialog/src/i18n/en.json
@@ -2,6 +2,8 @@
 	"TemplatePicker": {
 		"AppPickerDefault": "Choose App",
 		"ContentTypePickerDefault": "Choose Content Type",
+    "ViewNeedsContentType": "Please choose Content Type first",
+    "ViewNeedsApp": "Please choose App first",
 		"LayoutElement": "Layout element",
 		"ChangeView": "Change view",
 

From 34b60a47a64c2c86b9c23daf2fd3530e259787a7 Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 11 Nov 2022 17:41:00 +0100
Subject: [PATCH 4/5] minor fix to ensure tabs change
 https://github.com/2sic/2sxc/issues/2927

---
 .../src/app/template-picker/content-type.ts       |  2 +-
 .../data/content-types-processor.service.ts       |  4 ++--
 .../template-picker.component.html                |  4 ++--
 .../template-picker/template-picker.component.ts  | 15 ++++++++-------
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/projects/quick-dialog/src/app/template-picker/content-type.ts b/projects/quick-dialog/src/app/template-picker/content-type.ts
index 642b6885e..f699eee09 100644
--- a/projects/quick-dialog/src/app/template-picker/content-type.ts
+++ b/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;
 }
 
diff --git a/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts b/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
index 1283c40a6..f9684191e 100644
--- a/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
+++ b/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;
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.html b/projects/quick-dialog/src/app/template-picker/template-picker.component.html
index 9d928086d..6bd234c76 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.html
+++ b/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
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.ts b/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
index 6950a7830..5f07454cf 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
+++ b/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;
+    // });
   }
 
 

From 60d4e0d9071ae7c80911234ea1937da4e6a06e7c Mon Sep 17 00:00:00 2001
From: ijungleboy <daniel.mettler@2sic.com>
Date: Fri, 11 Nov 2022 17:44:34 +0100
Subject: [PATCH 5/5] minor

---
 .../template-picker/data/content-types-processor.service.ts | 6 +++---
 .../src/app/template-picker/template-picker.component.ts    | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts b/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
index f9684191e..f28d08370 100644
--- a/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
+++ b/projects/quick-dialog/src/app/template-picker/data/content-types-processor.service.ts
@@ -33,9 +33,9 @@ export class ContentTypesProcessor {
    * Ensure current content-type is visible, just in case it's configured as hidden
    */
   private unhideSelectedType(contentTypes: ContentType[], currentType: ContentType, currentTemplate: Template): ContentType[] {
-    console.log('2dm before', JSON.parse(JSON.stringify(contentTypes)));
-    console.log('2dm current T', currentTemplate?.TemplateId);
-    console.log('2dm currentType Static', currentType?.StaticName);
+    // console.log('2dm before', JSON.parse(JSON.stringify(contentTypes)));
+    // console.log('2dm current T', currentTemplate?.TemplateId);
+    // console.log('2dm currentType Static', currentType?.StaticName);
     contentTypes
       // 2022-11-04 2dm disabled, think it's never used
       // 2022-11-11 trying to fix another issue....
diff --git a/projects/quick-dialog/src/app/template-picker/template-picker.component.ts b/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
index 5f07454cf..c1c6f249a 100644
--- a/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
+++ b/projects/quick-dialog/src/app/template-picker/template-picker.component.ts
@@ -1,4 +1,3 @@
-
 import { ChangeDetectorRef, Component, OnInit } from '@angular/core';
 import { App } from 'app/core/app';
 import { BehaviorObservable } from 'app/core/behavior-observable';
@@ -19,7 +18,7 @@ const log = parentLog.subLog('picker', DebugConfig.picker.enabled);
 
 const nameofTPC = nameofFactory<TemplatePickerComponent>();
 
-const debug = true;
+const debug = false;
 
 @Component({
   selector: 'app-template-picker',