handle validate for choices

modules/@apostrophecms/schema/index.js

@@ -577,10 +577,21 @@ module.exports = {
       // `destination` (the current level). This allows resolution of relative
       // `following` paths during sanitization.
 
-      async convert(req, schema, data, destination, { fetchRelationships = true, ancestors = [] } = {}) {
+      async convert(
+        req,
+        schema,
+        data,
+        destination,
+        {
+          fetchRelationships = true,
+          ancestors = [],
+          isParentVisible = true
+        } = {}
+      ) {
         const options = {
           fetchRelationships,
-          ancestors
+          ancestors,
+          isParentVisible
         };
         if (Array.isArray(req)) {
           throw new Error('convert invoked without a req, do you have one in your context?');
@@ -603,6 +614,9 @@ module.exports = {
 
           if (convert) {
             try {
+              const isAllParentsVisible = isParentVisible === false
+                ? false
+                : await self.isVisible(req, schema, destination, field.name);
               const isRequired = await self.isFieldRequired(req, field, destination);
               await convert(
                 req,
@@ -612,7 +626,10 @@ module.exports = {
                 },
                 data,
                 destination,
-                options
+                {
+                  ...options,
+                  isParentVisible: isAllParentsVisible
+                }
               );
             } catch (error) {
               if (Array.isArray(error)) {
@@ -656,6 +673,9 @@ module.exports = {
                 continue;
               }
             }
+            if (isParentVisible === false) {
+              continue;
+            }
           }
 
           if (!Array.isArray(error) && typeof error !== 'string') {

modules/@apostrophecms/schema/lib/addFieldTypes.js

@@ -756,7 +756,17 @@ module.exports = (self) => {
 
   self.addFieldType({
     name: 'array',
-    async convert(req, field, data, destination, { fetchRelationships = true, ancestors = [] } = {}) {
+    async convert(
+      req,
+      field,
+      data,
+      destination,
+      {
+        fetchRelationships = true,
+        ancestors = [],
+        isParentVisible = true
+      } = {}
+    ) {
       const schema = field.schema;
       data = data[field.name];
       if (!Array.isArray(data)) {
@@ -779,7 +789,8 @@ module.exports = (self) => {
         try {
           const options = {
             fetchRelationships,
-            ancestors: [ ...ancestors, destination ]
+            ancestors: [ ...ancestors, destination ],
+            isParentVisible
           };
           await self.convert(req, schema, datum, result, options);
         } catch (e) {
@@ -861,7 +872,18 @@ module.exports = (self) => {
 
   self.addFieldType({
     name: 'object',
-    async convert(req, field, data, destination, { fetchRelationships = true, ancestors = {}, doc = {} } = {}) {
+    async convert(
+      req,
+      field,
+      data,
+      destination,
+      {
+        fetchRelationships = true,
+        ancestors = {},
+        isParentVisible = true,
+        doc = {}
+      } = {}
+    ) {
       data = data[field.name];
       const schema = field.schema;
       const errors = [];
@@ -871,7 +893,8 @@ module.exports = (self) => {
       };
       const options = {
         fetchRelationships,
-        ancestors: [ ...ancestors, destination ]
+        ancestors: [ ...ancestors, destination ],
+        isParentVisible
       };
       if (data == null || typeof data !== 'object' || Array.isArray(data)) {
         data = {};
@@ -961,8 +984,20 @@ module.exports = (self) => {
     // properties is handled at a lower level in a beforeSave
     // handler of the doc-type module.
 
-    async convert(req, field, data, destination, { fetchRelationships = true } = {}) {
-      const options = { fetchRelationships };
+    async convert(
+      req,
+      field,
+      data,
+      destination,
+      {
+        fetchRelationships = true,
+        isParentVisible = true
+      } = {}
+    ) {
+      const options = {
+        fetchRelationships,
+        isParentVisible
+      };
       const manager = self.apos.doc.getManager(field.withType);
       if (!manager) {
         throw Error('relationship with type ' + field.withType + ' unrecognized');

modules/@apostrophecms/schema/ui/apos/mixins/AposInputChoicesMixin.js

@@ -10,7 +10,8 @@ const DEBOUNCE_TIMEOUT = 500;
 export default {
   data() {
     return {
-      choices: []
+      choices: [],
+      enableValidate: false
     };
   },
 
@@ -33,6 +34,7 @@ export default {
 
   methods: {
     async getChoices() {
+      this.enableValidate = false;
       if (typeof this.field.choices === 'string') {
         const action = this.options.action;
         const response = await apos.http.post(
@@ -58,10 +60,12 @@ export default {
       }
     },
     updateChoices(choices) {
+      this.enableValidate = true;
       this.choices = choices;
       if (this.field.type === 'select') {
         this.prependEmptyChoice();
       }
+      this.validateAndEmit();
     },
     prependEmptyChoice() {
       // Using `hasOwn` here, not simply checking if `field.def` is truthy

modules/@apostrophecms/schema/ui/apos/mixins/AposInputMixin.js

@@ -136,6 +136,9 @@ export default {
     // You must supply the validate method. It receives the
     // internal representation used for editing (a string, for instance)
     validateAndEmit () {
+      if (this.enableValidate === false) {
+        return;
+      }
       // If the field is conditional and isn't shown, disregard any errors.
       const error = this.conditionMet === false ? false : this.validate(this.next);