From fc2cb8641c85e30f5b0de1dc5bb7f020cdb67558 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sun, 5 May 2019 15:54:24 -0700
Subject: [PATCH] afform_html - Split main screen into two smaller components

* Before: `afformHtmlEditor` contains list and edit screens
* After: `afformHtmlEditor` contains just the edit screen
* After: `afforHtmlList` contains just the list screen
* After: `afforHtmlAdmin` delegates to `afforHtmlList` and `afformHtmlEditor`
---
 ext/afform/html/ang/afformHtmlAdmin.aff.html  |  7 +++
 ext/afform/html/ang/afformHtmlAdmin.aff.json  |  5 ++
 ext/afform/html/ang/afformHtmlEditor.aff.html | 46 ++-----------------
 ext/afform/html/ang/afformHtmlEditor.aff.json |  1 -
 ext/afform/html/ang/afformHtmlList.aff.html   | 38 +++++++++++++++
 ext/afform/html/ang/afformHtmlList.aff.json   |  4 ++
 6 files changed, 57 insertions(+), 44 deletions(-)
 create mode 100644 ext/afform/html/ang/afformHtmlAdmin.aff.html
 create mode 100644 ext/afform/html/ang/afformHtmlAdmin.aff.json
 create mode 100644 ext/afform/html/ang/afformHtmlList.aff.html
 create mode 100644 ext/afform/html/ang/afformHtmlList.aff.json

diff --git a/ext/afform/html/ang/afformHtmlAdmin.aff.html b/ext/afform/html/ang/afformHtmlAdmin.aff.html
new file mode 100644
index 0000000000..c8f3a7e740
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlAdmin.aff.html
@@ -0,0 +1,7 @@
+<div ng-if="!routeParams.name">
+  <div afform-html-list=""></div>
+</div>
+
+<div ng-if="routeParams.name">
+  <div afform-html-editor="{name: routeParams.name}"></div>
+</div>
diff --git a/ext/afform/html/ang/afformHtmlAdmin.aff.json b/ext/afform/html/ang/afformHtmlAdmin.aff.json
new file mode 100644
index 0000000000..ff99ac0643
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlAdmin.aff.json
@@ -0,0 +1,5 @@
+{
+  "title": "Afform HTML Administration",
+  "server_route": "civicrm/admin/afform-html",
+  "requires":["afformCore", "afMoncao", "afformHtmlEditor", "afformHtmlList"]
+}
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.html b/ext/afform/html/ang/afformHtmlEditor.aff.html
index eca4e8f665..83c712cc8c 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.html
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.html
@@ -1,46 +1,5 @@
-<div ng-if="!routeParams.name">
-  <div
-    aff-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
-    aff-api4-ctrl="listCtrl">
-
-    <div ng-if="apiData.result.length == 0">
-      {{ts('There are no forms! Tell Aristotle!')}}
-    </div>
-
-    <table>
-      <thead>
-        <tr>
-          <th>{{ts('Name')}}</th>
-          <th>{{ts('Title')}}</th>
-          <th>{{ts('Server Route')}}</th>
-          <th>{{ts('Frontend?')}}</th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-      <tr ng-repeat="availForm in listCtrl.result">
-        <td>
-          <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
-        </td>
-        <td>{{availForm.title}}</td>
-        <td><code>{{availForm.server_route}}</code></td>
-        <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
-        <td>
-          <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
-          <a aff-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
-             msg-start="ts('Reverting...')"
-             msg-success="ts('Reverted')"
-            >{{ts('Revert')}}</a>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-
-  </div>
-</div>
-
-<div ng-if="routeParams.name"
-     aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', routeParams.name]]}]"
+<div 
+     aff-api4="['Afform', 'get', {layoutFormat: 'html', where: [['name', '=', options.name]]}]"
      aff-api4-ctrl="apiData">
 
   <div>
@@ -55,4 +14,5 @@
     <div crm-ui-debug="resultForm.layout"></div>
     <div af-monaco ng-model="resultForm.layout"></div>
   </div>
+
 </div>
diff --git a/ext/afform/html/ang/afformHtmlEditor.aff.json b/ext/afform/html/ang/afformHtmlEditor.aff.json
index ce82be9ed4..3f7f53f4b2 100644
--- a/ext/afform/html/ang/afformHtmlEditor.aff.json
+++ b/ext/afform/html/ang/afformHtmlEditor.aff.json
@@ -1,5 +1,4 @@
 {
   "title": "Afform HTML Editor",
-  "server_route": "civicrm/admin/afform-html",
   "requires":["afformCore", "afMoncao"]
 }
diff --git a/ext/afform/html/ang/afformHtmlList.aff.html b/ext/afform/html/ang/afformHtmlList.aff.html
new file mode 100644
index 0000000000..b6ccc76c18
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlList.aff.html
@@ -0,0 +1,38 @@
+<div
+  aff-api4="['Afform', 'get', {select: ['name','title','is_public','server_route'], orderBy: {name:'ASC'}}]"
+  aff-api4-ctrl="listCtrl">
+
+  <div ng-if="apiData.result.length == 0">
+    {{ts('There are no forms! Tell Aristotle!')}}
+  </div>
+
+  <table>
+    <thead>
+      <tr>
+        <th>{{ts('Name')}}</th>
+        <th>{{ts('Title')}}</th>
+        <th>{{ts('Server Route')}}</th>
+        <th>{{ts('Frontend?')}}</th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+    <tr ng-repeat="availForm in listCtrl.result">
+      <td>
+        <a ng-href="#/?name={{availForm.name}}">{{availForm.name}}</a>
+      </td>
+      <td>{{availForm.title}}</td>
+      <td><code>{{availForm.server_route}}</code></td>
+      <td>{{availForm.is_public ? ts('Frontend') : ts('Backend')}}</td>
+      <td>
+        <!--<a ng-click="crmStatus({start: ts('Reverting...'), success: ts('Reverted')}, crmApi4('Afform', 'revert', {where: [['name', '=', availForm.name]]}))">{{ts('Revert')}}</a>-->
+        <a aff-api4-action="['Afform', 'revert', {where: [['name','=', availForm.name]]}]"
+           msg-start="ts('Reverting...')"
+           msg-success="ts('Reverted')"
+          >{{ts('Revert')}}</a>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+
+</div>
diff --git a/ext/afform/html/ang/afformHtmlList.aff.json b/ext/afform/html/ang/afformHtmlList.aff.json
new file mode 100644
index 0000000000..a207554928
--- /dev/null
+++ b/ext/afform/html/ang/afformHtmlList.aff.json
@@ -0,0 +1,4 @@
+{
+  "title": "Afform HTML List",
+  "requires":["afformCore"]
+}
-- 
2.25.1