From aac015dc0b71d48f1a1cf342f957ccf53bf5e715 Mon Sep 17 00:00:00 2001
From: Tom Fulton <tom.fulton-contractor@nreca.coop>
Date: Mon, 23 Jun 2014 20:58:42 -0400
Subject: [PATCH 1/3] Refactor property aliases for uniqueness

Old: archetype-property-<umbracoPropertyAlias>-<fieldsetIndex>-<propertyIndex>
New: archetype-property-<umbracoPropertyAlias>-<archetypePropertyAlias>-<fieldsetIndex>

Basically, this adds the archetypePropertyAlias into the mix, to fix a case where you might have the same Archetype nested on a host Archetype twice  (ie box 1 links, box 2 links within the same Archetype - there was no uniqueness)

It also adds in the Property Alias in place of the Property "Index" (unintended side effect, but seems cool :))
---
 app/controllers/controller.js       |  4 ++++
 app/directives/archetypeproperty.js | 26 ++++++++++++++++++++++++--
 app/views/archetype.default.html    |  4 ++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/controllers/controller.js b/app/controllers/controller.js
index b70426a..b016205 100644
--- a/app/controllers/controller.js
+++ b/app/controllers/controller.js
@@ -11,6 +11,10 @@
 
     //ini the model
     $scope.model.value = $scope.model.value || getDefaultModel($scope.model.config);
+
+    // store the umbraco property alias to help generate unique IDs.  Hopefully there's a better way to get this in the future :)
+    $scope.umbracoHostPropertyAlias = $scope.$parent.$parent.model.alias;
+
     init();
 
     //helper to get $eval the labelTemplate
diff --git a/app/directives/archetypeproperty.js b/app/directives/archetypeproperty.js
index b54dd10..1e21e77 100644
--- a/app/directives/archetypeproperty.js
+++ b/app/directives/archetypeproperty.js
@@ -55,7 +55,8 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
         var config = null;
         var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias;
         var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value;
-        var umbracoPropertyAlias = scope.umbracoPropertyAlias;
+        var umbracoPropertyAlias = getUniquePropertyAlias(scope);
+        propertyAliasParts = [];
         // initialize container for invalid fieldset property identifiers (store on ngModelCtrl to separate Archetype validations, e.g. when there two Archetype properties on the same document)
         if(ngModelCtrl.invalidProperties == null) {
             ngModelCtrl.invalidProperties = [];
@@ -155,6 +156,27 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
         }
     }
 
+    var getPropertyAlias = function(currentScope) {
+        if (currentScope == null)
+            return "";
+        if (currentScope.property)
+            return currentScope.property.alias;
+    }
+
+    var propertyAliasParts = [];
+    var getUniquePropertyAlias = function (currentScope) {
+        var currentPropertyAlias = getPropertyAlias(currentScope);
+        if (currentPropertyAlias != null)
+            propertyAliasParts.push(currentPropertyAlias);
+
+        if (currentScope.$parent)
+            getUniquePropertyAlias(currentScope.$parent);
+
+        var alias = _.unique(propertyAliasParts).reverse().join("-");
+        return alias;
+    };
+
+
     function loadView(view, config, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl, validateProperty) {
         if (view)
         {
@@ -184,7 +206,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                     scope.model.config = config;
 
                     //some items need an alias
-                    scope.model.alias = "archetype-property-" + umbracoPropertyAlias + "-" + scope.fieldsetIndex + "-" + scope.propertyConfigIndex;
+                    scope.model.alias = "archetype-property-" + umbracoPropertyAlias + "-" + scope.fieldsetIndex;
 
                     //watch for changes since there is no two-way binding with the local model.value
                     scope.$watch('model.value', function (newValue, oldValue) {
diff --git a/app/views/archetype.default.html b/app/views/archetype.default.html
index 13238df..ed6bde7 100644
--- a/app/views/archetype.default.html
+++ b/app/views/archetype.default.html
@@ -29,7 +29,7 @@
                 <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
                     <form class="form-inline">
                         <div ng-class="[property.alias, (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
-                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{model.alias}}-{{$parent.$index}}-{{$index}}">
+                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{umbracoHostPropertyAlias}}-{{property.alias}}-{{$parent.$index}}">
                                 <span>{{property.label}}</span>
                                 <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
                                     <small>{{property.helpText}}</small>
@@ -37,7 +37,7 @@
                             </label>
 
                             <div class="controls">
-                                <archetype-property class="archetypeEditor" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-property-alias="model.alias" umbraco-form = "form"></archetype-property>
+                                <archetype-property class="archetypeEditor" property="property" fieldset-index="$parent.$index" fieldset="fieldset" archetype-config="model.config" property-config-index="$index" archetype-render-model="model.value" umbraco-form = "form"></archetype-property>
                             </div>
                         </div>
                     </form>

From ed97d586b4953c1091d2d6255c58e6ffa25121f6 Mon Sep 17 00:00:00 2001
From: Tom Fulton <tom.fulton-contractor@nreca.coop>
Date: Wed, 25 Jun 2014 11:35:32 -0400
Subject: [PATCH 2/3] Make property aliases even more unique

archetype-property-<umbracoPropertyAlias>-<fieldsetIndex>-<archetypePropertyAlias>-<archetypePropertyIndex>-<and so on...>
---
 app/directives/archetypeproperty.js | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/app/directives/archetypeproperty.js b/app/directives/archetypeproperty.js
index 1e21e77..080e7d6 100644
--- a/app/directives/archetypeproperty.js
+++ b/app/directives/archetypeproperty.js
@@ -55,7 +55,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
         var config = null;
         var alias = configFieldsetModel.properties[scope.propertyConfigIndex].alias;
         var defaultValue = configFieldsetModel.properties[scope.propertyConfigIndex].value;
-        var umbracoPropertyAlias = getUniquePropertyAlias(scope);
+        var propertyAlias = getUniquePropertyAlias(scope);
         propertyAliasParts = [];
         // initialize container for invalid fieldset property identifiers (store on ngModelCtrl to separate Archetype validations, e.g. when there two Archetype properties on the same document)
         if(ngModelCtrl.invalidProperties == null) {
@@ -86,7 +86,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
 
                 var mergedConfig = _.extend(defaultConfigObj, config);
 
-                loadView(pathToView, mergedConfig, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl, validateProperty);
+                loadView(pathToView, mergedConfig, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, validateProperty);
             });
         });
 
@@ -156,28 +156,27 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
         }
     }
 
-    var getPropertyAlias = function(currentScope) {
-        if (currentScope == null)
-            return "";
-        if (currentScope.property)
-            return currentScope.property.alias;
-    }
-
     var propertyAliasParts = [];
     var getUniquePropertyAlias = function (currentScope) {
-        var currentPropertyAlias = getPropertyAlias(currentScope);
-        if (currentPropertyAlias != null)
+        if (currentScope.hasOwnProperty('fieldsetIndex') && currentScope.hasOwnProperty('property') && currentScope.hasOwnProperty('propertyConfigIndex'))
+        {
+            var currentPropertyAlias = "f" + currentScope.fieldsetIndex + "-" + currentScope.property.alias + "-p" + currentScope.propertyConfigIndex;
             propertyAliasParts.push(currentPropertyAlias);
+        }
+        else if (currentScope.hasOwnProperty('isPreValue')) // Crappy way to identify this is the umbraco property scope
+        {
+            var umbracoPropertyAlias = currentScope.$parent.$parent.property.alias; // Crappy way to get the umbraco host alias once we identify its scope
+            propertyAliasParts.push(umbracoPropertyAlias);
+        }
 
         if (currentScope.$parent)
             getUniquePropertyAlias(currentScope.$parent);
 
-        var alias = _.unique(propertyAliasParts).reverse().join("-");
-        return alias;
+        return _.unique(propertyAliasParts).reverse().join("-");
     };
 
 
-    function loadView(view, config, defaultValue, alias, umbracoPropertyAlias, scope, element, ngModelCtrl, validateProperty) {
+    function loadView(view, config, defaultValue, alias, propertyAlias, scope, element, ngModelCtrl, validateProperty) {
         if (view)
         {
             $http.get(view).success(function (data) {
@@ -206,7 +205,7 @@ angular.module("umbraco.directives").directive('archetypeProperty', function ($c
                     scope.model.config = config;
 
                     //some items need an alias
-                    scope.model.alias = "archetype-property-" + umbracoPropertyAlias + "-" + scope.fieldsetIndex;
+                    scope.model.alias = "archetype-property-" + propertyAlias;
 
                     //watch for changes since there is no two-way binding with the local model.value
                     scope.$watch('model.value', function (newValue, oldValue) {

From c83942dc5c9e2d66b1878619c52b459346d4f319 Mon Sep 17 00:00:00 2001
From: Tom Fulton <tom.fulton-contractor@nreca.coop>
Date: Wed, 25 Jun 2014 22:03:22 -0400
Subject: [PATCH 3/3] Update field labels to match new property alias scheme

Only for the first level, since focusing an Archetype isn't really a thing
---
 app/views/archetype.default.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/archetype.default.html b/app/views/archetype.default.html
index 0e788f8..a3f55c4 100644
--- a/app/views/archetype.default.html
+++ b/app/views/archetype.default.html
@@ -29,7 +29,7 @@
                 <div class="archetypeCollapser animate-hide" ng-hide="isCollapsed(fieldset)">
                     <form class="form-inline">
                         <div ng-class="[property.alias, (getPropertyValidity($parent.$index, property.alias) === false ? 'archetypePropertyError' : '')]" class="archetypeProperty control-group" ng-repeat="property in fieldsetConfigModel.properties">
-                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{umbracoHostPropertyAlias}}-{{property.alias}}-{{$parent.$index}}">
+                            <label ng-hide="archetypeConfig.hidePropertyLabels == '1'" class="control-label" for="archetype-property-{{umbracoHostPropertyAlias}}-f{{$parent.$index}}-{{property.alias}}-p{{$index}}">
                                 <span>{{property.label}}</span>
                                 <div class="archetypeFieldsetHelpText" ng-show="property.helpText">
                                     <small>{{property.helpText}}</small>