From 077643c557648dea4af60879cac3a4225ef8f8cb Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 31 Jul 2018 17:58:55 +0000
Subject: [PATCH] CCM NG: Some bug fixes for the PageModels Editor

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5620 8810af33-2d31-482b-a856-94f89814c4df
---
 .../ccm-cms/ccm-cms-pagemodelseditor.tsx      | 12 +++++-----
 .../ccm-pagemodelseditor/PageModelsEditor.tsx |  5 +++++
 .../themes/foundry/foundry/styles/admin.css   | 22 +++++++++++++------
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/ccm-cms-js/src/main/typescript/ccm-cms/ccm-cms-pagemodelseditor.tsx b/ccm-cms-js/src/main/typescript/ccm-cms/ccm-cms-pagemodelseditor.tsx
index 119942329..9c57a9918 100644
--- a/ccm-cms-js/src/main/typescript/ccm-cms/ccm-cms-pagemodelseditor.tsx
+++ b/ccm-cms-js/src/main/typescript/ccm-cms/ccm-cms-pagemodelseditor.tsx
@@ -188,7 +188,7 @@ class ItemListComponentEditorDialog extends React.Component<
             <label htmlFor={`${idPrefix}descending`}>
                 Descending?
             </label>
-            <input checked={this.props.component.descending}
+            <input checked={this.state.descending}
                    id={`${idPrefix}descending`}
                    onChange={this.handleChange}
                    type="checkbox" />
@@ -200,15 +200,15 @@ class ItemListComponentEditorDialog extends React.Component<
                    onChange={this.handleChange}
                    size={64}
                    type="text"
-                   value={this.props.component.limitToType}/>
-            <label htmlFor={`$idPrefix}pageSize`}>
+                   value={this.state.limitToType}/>
+            <label htmlFor={`{$idPrefix}pageSize`}>
                 Page size
             </label>
             <input id={`${idPrefix}pageSize`}
                    min="1"
                    onChange={this.handleChange}
                    type="number"
-                   value={this.props.component.pageSize}/>
+                   value={this.state.pageSize}/>
             <label htmlFor={`${idPrefix}listOrder`}>
                 List Order
             </label>
@@ -216,8 +216,8 @@ class ItemListComponentEditorDialog extends React.Component<
                       id={`${idPrefix}listOrder`}
                       onChange={this.handleListOrderChange}
                       rows={5}>
-                {Array.isArray(this.props.component.listOrder) ? (
-                    this.props.component.listOrder.join("\n")
+                {Array.isArray(this.state.listOrder) ? (
+                    this.state.listOrder.join("\n")
                 ) : (
                     ""
                 )}
diff --git a/ccm-pagemodelseditor/src/main/typescript/ccm-pagemodelseditor/PageModelsEditor.tsx b/ccm-pagemodelseditor/src/main/typescript/ccm-pagemodelseditor/PageModelsEditor.tsx
index edbebbddd..550ad075f 100644
--- a/ccm-pagemodelseditor/src/main/typescript/ccm-pagemodelseditor/PageModelsEditor.tsx
+++ b/ccm-pagemodelseditor/src/main/typescript/ccm-pagemodelseditor/PageModelsEditor.tsx
@@ -797,6 +797,11 @@ class ContainerModelComponent
         this.fetchComponents();
     }
 
+    public componentDidUpdate() {
+
+        this.fetchComponents();
+    }
+
     public render(): React.ReactNode {
 
         return <li>
diff --git a/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/styles/admin.css b/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/styles/admin.css
index 425727336..c76d0c190 100644
--- a/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/styles/admin.css
+++ b/ccm-theme-foundry/src/main/resources/themes/foundry/foundry/styles/admin.css
@@ -2073,12 +2073,13 @@ div.errorPanel {
     left: 5em;
 } */
 
-li.componentModelEditor dialog.dialogClosed {
+li.componentModelEditor dialog.dialogClosed
+li.componentModelEditor dialog {
     display: none;
 }
 
-li.componentModelEditor dialog.dialogExpanded {
-
+li.componentModelEditor dialog.dialogExpanded,
+li.componentModelEditor dialog[open] {
     border: 2px solid #ccc;
     border-radius: 3rem;
 
@@ -2097,7 +2098,8 @@ li.componentModelEditor dialog.dialogExpanded {
     z-index: 1000;
 }
 
-li.componentModelEditor dialog.dialogExpanded button.closeButton {
+li.componentModelEditor dialog.dialogExpanded button.closeButton,
+li.componentModelEditor dialog[open] button.closeButton {
 
     background-color: transparent;
 
@@ -2130,7 +2132,8 @@ li.componentModelEditor dl dd {
     margin-bottom: 0.5em;
 }
 
-li.componentModelEditor dialog.dialogExpanded h1 {
+li.componentModelEditor dialog.dialogExpanded h1,
+li.componentModelEditor dialog[open] h1 {
 
     background-color: #0776a0;
 
@@ -2158,13 +2161,18 @@ li.componentModelEditor dialog.dialogExpanded h1 {
 
 li.componentModelEditor dialog.dialogExpanded input,
 li.componentModelEditor dialog.dialogExpanded label,
-li.componentModelEditor dialog.dialogExpanded textarea {
+li.componentModelEditor dialog.dialogExpanded textarea,
+li.componentModelEditor dialog[open] input,
+li.componentModelEditor dialog[open] label,
+li.componentModelEditor dialog[open] textarea {
 
     display: block;
 }
 
 li.componentModelEditor dialog.dialogExpanded input,
-li.componentModelEditor dialog.dialogExpanded textarea {
+li.componentModelEditor dialog.dialogExpanded textarea,
+li.componentModelEditor dialog[open] input,
+li.componentModelEditor dialog[open] textarea {
 
     margin-bottom: 1em;
 }