From ee1a7fb6c5a7ca0aa8dc419b20576ba53a10abb4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Fri, 3 Jan 2020 20:42:59 -0500
Subject: [PATCH] Rename blocks & require form name

---
 ...usehold.aff.html => afblockNameHousehold.aff.html} |  0
 ...usehold.aff.json => afblockNameHousehold.aff.json} |  0
 ...vidual.aff.html => afblockNameIndividual.aff.html} |  0
 ...vidual.aff.json => afblockNameIndividual.aff.json} |  0
 ...tion.aff.html => afblockNameOrganization.aff.html} |  0
 ...tion.aff.json => afblockNameOrganization.aff.json} |  0
 ...Default.aff.html => afjoinAddressDefault.aff.html} |  0
 ...Default.aff.json => afjoinAddressDefault.aff.json} |  0
 ...ilDefault.aff.html => afjoinEmailDefault.aff.html} |  0
 ...ilDefault.aff.json => afjoinEmailDefault.aff.json} |  2 +-
 ...ockIMDefault.aff.html => afjoinIMDefault.aff.html} |  0
 ...ockIMDefault.aff.json => afjoinIMDefault.aff.json} |  2 +-
 ...neDefault.aff.html => afjoinPhoneDefault.aff.html} |  0
 ...neDefault.aff.json => afjoinPhoneDefault.aff.json} |  2 +-
 ...Default.aff.html => afjoinWebsiteDefault.aff.html} |  0
 ...Default.aff.json => afjoinWebsiteDefault.aff.json} |  2 +-
 ext/afform/gui/ang/afGuiEditor.js                     | 11 ++++-------
 ext/afform/gui/ang/afGuiEditor/canvas.html            |  2 +-
 ext/afform/gui/ang/afGuiEditor/config-form.html       |  4 ++--
 19 files changed, 11 insertions(+), 14 deletions(-)
 rename ext/afform/core/ang/{blockNameHousehold.aff.html => afblockNameHousehold.aff.html} (100%)
 rename ext/afform/core/ang/{blockNameHousehold.aff.json => afblockNameHousehold.aff.json} (100%)
 rename ext/afform/core/ang/{blockNameIndividual.aff.html => afblockNameIndividual.aff.html} (100%)
 rename ext/afform/core/ang/{blockNameIndividual.aff.json => afblockNameIndividual.aff.json} (100%)
 rename ext/afform/core/ang/{blockNameOrganization.aff.html => afblockNameOrganization.aff.html} (100%)
 rename ext/afform/core/ang/{blockNameOrganization.aff.json => afblockNameOrganization.aff.json} (100%)
 rename ext/afform/core/ang/{blockAddressDefault.aff.html => afjoinAddressDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockAddressDefault.aff.json => afjoinAddressDefault.aff.json} (100%)
 rename ext/afform/core/ang/{blockEmailDefault.aff.html => afjoinEmailDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockEmailDefault.aff.json => afjoinEmailDefault.aff.json} (63%)
 rename ext/afform/core/ang/{blockIMDefault.aff.html => afjoinIMDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockIMDefault.aff.json => afjoinIMDefault.aff.json} (64%)
 rename ext/afform/core/ang/{blockPhoneDefault.aff.html => afjoinPhoneDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockPhoneDefault.aff.json => afjoinPhoneDefault.aff.json} (63%)
 rename ext/afform/core/ang/{blockWebsiteDefault.aff.html => afjoinWebsiteDefault.aff.html} (100%)
 rename ext/afform/core/ang/{blockWebsiteDefault.aff.json => afjoinWebsiteDefault.aff.json} (62%)

diff --git a/ext/afform/core/ang/blockNameHousehold.aff.html b/ext/afform/core/ang/afblockNameHousehold.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockNameHousehold.aff.html
rename to ext/afform/core/ang/afblockNameHousehold.aff.html
diff --git a/ext/afform/core/ang/blockNameHousehold.aff.json b/ext/afform/core/ang/afblockNameHousehold.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockNameHousehold.aff.json
rename to ext/afform/core/ang/afblockNameHousehold.aff.json
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.html b/ext/afform/core/ang/afblockNameIndividual.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockNameIndividual.aff.html
rename to ext/afform/core/ang/afblockNameIndividual.aff.html
diff --git a/ext/afform/core/ang/blockNameIndividual.aff.json b/ext/afform/core/ang/afblockNameIndividual.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockNameIndividual.aff.json
rename to ext/afform/core/ang/afblockNameIndividual.aff.json
diff --git a/ext/afform/core/ang/blockNameOrganization.aff.html b/ext/afform/core/ang/afblockNameOrganization.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockNameOrganization.aff.html
rename to ext/afform/core/ang/afblockNameOrganization.aff.html
diff --git a/ext/afform/core/ang/blockNameOrganization.aff.json b/ext/afform/core/ang/afblockNameOrganization.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockNameOrganization.aff.json
rename to ext/afform/core/ang/afblockNameOrganization.aff.json
diff --git a/ext/afform/core/ang/blockAddressDefault.aff.html b/ext/afform/core/ang/afjoinAddressDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockAddressDefault.aff.html
rename to ext/afform/core/ang/afjoinAddressDefault.aff.html
diff --git a/ext/afform/core/ang/blockAddressDefault.aff.json b/ext/afform/core/ang/afjoinAddressDefault.aff.json
similarity index 100%
rename from ext/afform/core/ang/blockAddressDefault.aff.json
rename to ext/afform/core/ang/afjoinAddressDefault.aff.json
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.html b/ext/afform/core/ang/afjoinEmailDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockEmailDefault.aff.html
rename to ext/afform/core/ang/afjoinEmailDefault.aff.html
diff --git a/ext/afform/core/ang/blockEmailDefault.aff.json b/ext/afform/core/ang/afjoinEmailDefault.aff.json
similarity index 63%
rename from ext/afform/core/ang/blockEmailDefault.aff.json
rename to ext/afform/core/ang/afjoinEmailDefault.aff.json
index 107756e1c1..b09da6a075 100644
--- a/ext/afform/core/ang/blockEmailDefault.aff.json
+++ b/ext/afform/core/ang/afjoinEmailDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "Email Block (default)",
+  "title": "Email (default)",
   "block": "Contact",
   "join": "Email",
   "repeat": true
diff --git a/ext/afform/core/ang/blockIMDefault.aff.html b/ext/afform/core/ang/afjoinIMDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockIMDefault.aff.html
rename to ext/afform/core/ang/afjoinIMDefault.aff.html
diff --git a/ext/afform/core/ang/blockIMDefault.aff.json b/ext/afform/core/ang/afjoinIMDefault.aff.json
similarity index 64%
rename from ext/afform/core/ang/blockIMDefault.aff.json
rename to ext/afform/core/ang/afjoinIMDefault.aff.json
index 261df8a830..2ef6b577cb 100644
--- a/ext/afform/core/ang/blockIMDefault.aff.json
+++ b/ext/afform/core/ang/afjoinIMDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "IM Block (default)",
+  "title": "IM (default)",
   "block": "Contact",
   "join": "IM",
   "repeat": true
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.html b/ext/afform/core/ang/afjoinPhoneDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockPhoneDefault.aff.html
rename to ext/afform/core/ang/afjoinPhoneDefault.aff.html
diff --git a/ext/afform/core/ang/blockPhoneDefault.aff.json b/ext/afform/core/ang/afjoinPhoneDefault.aff.json
similarity index 63%
rename from ext/afform/core/ang/blockPhoneDefault.aff.json
rename to ext/afform/core/ang/afjoinPhoneDefault.aff.json
index 9419dbdb17..c40af8dcb2 100644
--- a/ext/afform/core/ang/blockPhoneDefault.aff.json
+++ b/ext/afform/core/ang/afjoinPhoneDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "Phone Block (default)",
+  "title": "Phone (default)",
   "block": "Contact",
   "join": "Phone",
   "repeat": true
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.html b/ext/afform/core/ang/afjoinWebsiteDefault.aff.html
similarity index 100%
rename from ext/afform/core/ang/blockWebsiteDefault.aff.html
rename to ext/afform/core/ang/afjoinWebsiteDefault.aff.html
diff --git a/ext/afform/core/ang/blockWebsiteDefault.aff.json b/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
similarity index 62%
rename from ext/afform/core/ang/blockWebsiteDefault.aff.json
rename to ext/afform/core/ang/afjoinWebsiteDefault.aff.json
index 71b1e68a78..4819bc92d8 100644
--- a/ext/afform/core/ang/blockWebsiteDefault.aff.json
+++ b/ext/afform/core/ang/afjoinWebsiteDefault.aff.json
@@ -1,5 +1,5 @@
 {
-  "title": "Website Block (default)",
+  "title": "Website (default)",
   "block": "Contact",
   "join": "Website",
   "repeat": true
diff --git a/ext/afform/gui/ang/afGuiEditor.js b/ext/afform/gui/ang/afGuiEditor.js
index 609de11e2f..d8316b713c 100644
--- a/ext/afform/gui/ang/afGuiEditor.js
+++ b/ext/afform/gui/ang/afGuiEditor.js
@@ -29,13 +29,10 @@
         $scope.saving = false;
         $scope.selectedEntityName = null;
         $scope.meta = this.meta = CRM.afformAdminData;
-        _.each($scope.meta.blocks, function(block) {
-          evaluate(block.layout);
-        });
         this.scope = $scope;
         var editor = $scope.editor = this;
         var newForm = {
-          title: ts('Untitled Form'),
+          title: '',
           permission: 'access CiviCRM',
           layout: [{
             '#tag': 'af-form',
@@ -62,10 +59,9 @@
           if (!$scope.afform) {
             $scope.afform = _.cloneDeep(newForm);
             if ($scope.afGuiEditor.name != '0') {
-              alert('Error: could not find form ' + $scope.afGuiEditor.name);
+              alert('Error: unknown form "' + $scope.afGuiEditor.name + '"');
             }
           }
-          $scope.changesSaved = 1;
           $scope.layout = findRecursive($scope.afform.layout, {'#tag': 'af-form'})[0];
           $scope.entities = findRecursive($scope.layout['#children'], {'#tag': 'af-entity'}, 'name');
 
@@ -75,6 +71,7 @@
           }
 
           // Set changesSaved to true on initial load, false thereafter whenever changes are made to the model
+          $scope.changesSaved = $scope.afGuiEditor.name == '0' ? false : 1;
           $scope.$watch('afform', function () {
             $scope.changesSaved = $scope.changesSaved === 1;
           }, true);
@@ -114,7 +111,7 @@
           };
           // Add default contact name block
           if (meta.entity === 'Contact') {
-            fieldset['#children'].push({'#tag': 'block-name-' + type.toLowerCase()});
+            fieldset['#children'].push({'#tag': 'afblock-name-' + type.toLowerCase()});
           }
           // Attempt to place the new af-fieldset after the last one on the form
           pos = 1 + _.findLastIndex($scope.layout['#children'], 'af-fieldset');
diff --git a/ext/afform/gui/ang/afGuiEditor/canvas.html b/ext/afform/gui/ang/afGuiEditor/canvas.html
index 5dbad937dc..10e3950b05 100644
--- a/ext/afform/gui/ang/afGuiEditor/canvas.html
+++ b/ext/afform/gui/ang/afGuiEditor/canvas.html
@@ -2,7 +2,7 @@
   <div class="panel-heading">
     <form class="form-inline">
       <div class="btn-group btn-group-md pull-right">
-        <button class="btn" ng-class="{'btn-primary': !changesSaved && !saving, 'btn-warning': saving, 'btn-success': changesSaved}" ng-disabled="changesSaved || saving" ng-click="save()">
+        <button type="submit" class="btn" ng-class="{'btn-primary': !changesSaved && !saving, 'btn-warning': saving, 'btn-success': changesSaved}" ng-disabled="changesSaved || saving || !afform.title" ng-click="save()">
           <i class="crm-i" ng-class="{'fa-check': !saving, 'fa-spin fa-spinner': saving}"></i>
           <span ng-if="changesSaved && !saving">{{ ts('Saved') }}</span>
           <span ng-if="!changesSaved && !saving">{{ ts('Save') }}</span>
diff --git a/ext/afform/gui/ang/afGuiEditor/config-form.html b/ext/afform/gui/ang/afGuiEditor/config-form.html
index 8b602aee31..a3169e8bb2 100644
--- a/ext/afform/gui/ang/afGuiEditor/config-form.html
+++ b/ext/afform/gui/ang/afGuiEditor/config-form.html
@@ -1,7 +1,7 @@
 <label for="af_config_form_title">
-  {{ ts('Title:') }}
+  {{ ts('Title:') }} <span class="crm-marker">*</span>
 </label>
-<input ng-model="afform.title" class="form-control" id="af_config_form_title" />
+<input ng-model="afform.title" class="form-control" id="af_config_form_title" required />
 <label for="af_config_form_description">
   {{ ts('Description:') }}
 </label>
-- 
2.25.1