Fix schema switch.

Squidex · Aug 17, 2023 · 533daf1 · 533daf1
1 parent 5c293a2
commit 533daf1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/frontend/src/app/features/content/pages/contents/contents-page.component.ts b/frontend/src/app/features/content/pages/contents/contents-page.component.ts
@@ -108,7 +108,7 @@ export class ContentsPageComponent extends ResourceOwner implements OnInit {
         this.own(
             combineLatest([schema$, tableName$])
                 .subscribe(([schema, fieldNames]) => {
-                    if (!this.schema) {
+                    if (this.schema?.id !== schema.id) {
                         this.resetSelection();
 
                         this.schema = schema;

diff --git a/frontend/src/app/features/content/pages/contents/custom-view-editor.component.html b/frontend/src/app/features/content/pages/contents/custom-view-editor.component.html
@@ -17,7 +17,12 @@
             <div class="form-check">
                 <input class="form-check-input" type="checkbox" checked (click)="removeField(field)" id="field_{{field}}" [disabled]="!field">
                 <label class="form-check-label" for="field_{{field}}">
-                    {{(field.title || field.label) | sqxTranslate}}: <code>{{field.name}}</code>
+                    <span *ngIf="field.name">
+                        {{(field.title || field.label) | sqxTranslate}}: <code>{{field.name}}</code>
+                    </span>
+                    <span class="text-muted" *ngIf="!field.name">
+                        - Placeholder -
+                    </span>
                 </label>
             </div>
         </div>
@@ -33,7 +38,12 @@
                 <div class="form-check">
                     <input class="form-check-input" type="checkbox" (click)="addField(field)" id="field_{{field}}">
                     <label class="form-check-label" for="field_{{field}}">
-                        {{(field.title || field.label) | sqxTranslate}}: <code>{{field.name}}</code>
+                        <span *ngIf="field.name">
+                            {{(field.title || field.label) | sqxTranslate}}: <code>{{field.name}}</code>
+                        </span>
+                        <span class="text-muted" *ngIf="!field.name">
+                            - Placeholder -
+                        </span>
                     </label>
                 </div>
             </div>