Merge pull request #203 from juanvallejo/jvallejo/add-osc-unique-disabled-attr

add ability to "disable" form validity

dist/origin-web-common-ui.js

@@ -978,11 +978,13 @@ angular.module('openshiftCommonUI')
     return {
       restrict: 'A',
       scope: {
-        oscUnique: '='
+        oscUnique: '=',
+        oscUniqueDisabled: '='
       },
       require: 'ngModel',
       link: function($scope, $elem, $attrs, ctrl) {
         var list = [];
+        var isUnique = true;
 
         $scope.$watchCollection('oscUnique', function(newVal) {
           list = _.isArray(newVal) ?
@@ -990,9 +992,15 @@ angular.module('openshiftCommonUI')
                     _.keys(newVal);
         });
 
+        var updateValidity = function() {
+          ctrl.$setValidity('oscUnique', $scope.oscUniqueDisabled || isUnique);
+        };
+
+        $scope.$watch('oscUniqueDisabled', updateValidity);
+
         ctrl.$parsers.unshift(function(value) {
-          // is valid so long as it doesn't already exist
-          ctrl.$setValidity('oscUnique', !_.includes(list, value));
+          isUnique = !_.includes(list, value);
+          updateValidity();
           return value;
         });
       }

dist/origin-web-common.js

@@ -1149,11 +1149,13 @@ angular.module('openshiftCommonUI')
     return {
       restrict: 'A',
       scope: {
-        oscUnique: '='
+        oscUnique: '=',
+        oscUniqueDisabled: '='
       },
       require: 'ngModel',
       link: function($scope, $elem, $attrs, ctrl) {
         var list = [];
+        var isUnique = true;
 
         $scope.$watchCollection('oscUnique', function(newVal) {
           list = _.isArray(newVal) ?
@@ -1161,9 +1163,15 @@ angular.module('openshiftCommonUI')
                     _.keys(newVal);
         });
 
+        var updateValidity = function() {
+          ctrl.$setValidity('oscUnique', $scope.oscUniqueDisabled || isUnique);
+        };
+
+        $scope.$watch('oscUniqueDisabled', updateValidity);
+
         ctrl.$parsers.unshift(function(value) {
-          // is valid so long as it doesn't already exist
-          ctrl.$setValidity('oscUnique', !_.includes(list, value));
+          isUnique = !_.includes(list, value);
+          updateValidity();
           return value;
         });
       }

dist/origin-web-common.min.js

@@ -345,15 +345,20 @@ ctrl.shown && onHide();
 return {
 restrict:"A",
 scope:{
-oscUnique:"="
+oscUnique:"=",
+oscUniqueDisabled:"="
 },
 require:"ngModel",
 link:function($scope, $elem, $attrs, ctrl) {
-var list = [];
+var list = [], isUnique = !0;
 $scope.$watchCollection("oscUnique", function(newVal) {
 list = _.isArray(newVal) ? newVal :_.keys(newVal);
-}), ctrl.$parsers.unshift(function(value) {
-return ctrl.$setValidity("oscUnique", !_.includes(list, value)), value;
+});
+var updateValidity = function() {
+ctrl.$setValidity("oscUnique", $scope.oscUniqueDisabled || isUnique);
+};
+$scope.$watch("oscUniqueDisabled", updateValidity), ctrl.$parsers.unshift(function(value) {
+return isUnique = !_.includes(list, value), updateValidity(), value;
 });
 }
 };

src/components/osc-unique/oscUnique.js

@@ -31,11 +31,13 @@ angular.module('openshiftCommonUI')
     return {
       restrict: 'A',
       scope: {
-        oscUnique: '='
+        oscUnique: '=',
+        oscUniqueDisabled: '='
       },
       require: 'ngModel',
       link: function($scope, $elem, $attrs, ctrl) {
         var list = [];
+        var isUnique = true;
 
         $scope.$watchCollection('oscUnique', function(newVal) {
           list = _.isArray(newVal) ?
@@ -43,9 +45,15 @@ angular.module('openshiftCommonUI')
                     _.keys(newVal);
         });
 
+        var updateValidity = function() {
+          ctrl.$setValidity('oscUnique', $scope.oscUniqueDisabled || isUnique);
+        };
+
+        $scope.$watch('oscUniqueDisabled', updateValidity);
+
         ctrl.$parsers.unshift(function(value) {
-          // is valid so long as it doesn't already exist
-          ctrl.$setValidity('oscUnique', !_.includes(list, value));
+          isUnique = !_.includes(list, value);
+          updateValidity();
           return value;
         });
       }