slice-machine-ui 2.16.2-alpha.jp-cr-ui-fix-invalid-fields-checked.7 → 2.16.2-alpha.jp-cr-ui-fix-invalid-fields-checked.9

package/src/features/builder/fields/contentRelationship/__tests__/ContentRelationshipFieldPicker.test.ts

@@ -366,7 +366,7 @@ describe("ContentRelationshipFieldPicker", () => {
   });
 
   describe("createContentRelationshipFieldCheckMap", () => {
-    it("should include existing/valid referenced fields", () => {
+    it("should include existing/valid referenced regular root fields", () => {
       const customType: CustomType = {
         id: "customType",
         label: "Custom Type",
@@ -515,21 +515,7 @@ describe("ContentRelationshipFieldPicker", () => {
       });
     });
 
-    it("should not include non-existing/invalid referenced fields", () => {
-      const customType2: CustomType = {
-        id: "customType2",
-        label: "Custom Type 2",
-        repeatable: false,
-        status: true,
-        json: {
-          Main: {
-            booleanField: {
-              type: "Boolean",
-            },
-          },
-        },
-      };
-
+    it("should include a correctly referenced group field", () => {
       const customType: CustomType = {
         id: "customType",
         label: "Custom Type",
@@ -537,22 +523,16 @@ describe("ContentRelationshipFieldPicker", () => {
         status: true,
         json: {
           Main: {
-            mdField: {
-              type: "StructuredText",
-            },
-            crField: {
-              type: "Link",
-              config: {
-                select: "document",
-                customtypes: ["customType2"],
-              },
-            },
             groupField: {
               type: "Group",
               config: {
+                label: "Group Field",
                 fields: {
-                  groupFieldA: {
+                  booleanField: {
                     type: "Boolean",
+                    config: {
+                      label: "Boolean Field",
+                    },
                   },
                 },
               },
@@ -566,42 +546,32 @@ describe("ContentRelationshipFieldPicker", () => {
           {
             id: "customType",
             fields: [
-              "mdField",
-              "nonExistingField",
-              {
-                id: "nonExistingGroup",
-                fields: ["groupFieldA"],
-              },
-              {
-                id: "crField",
-                customtypes: [
-                  {
-                    id: "customType2",
-                    fields: ["nonExistingNestedField"],
-                  },
-                ],
-              },
               {
                 id: "groupField",
-                fields: ["nonExistingGroupField"],
+                fields: ["booleanField"],
               },
             ],
           },
         ],
-        allCustomTypes: [customType, customType2],
+        allCustomTypes: [customType],
       });
 
       expect(result).toEqual({
         customType: {
-          mdField: {
-            type: "checkbox",
-            value: true,
+          groupField: {
+            type: "group",
+            value: {
+              booleanField: {
+                type: "checkbox",
+                value: true,
+              },
+            },
           },
         },
       });
     });
 
-    it("should not include an invalid field (uid, slices & choice)", () => {
+    it("should include a correctly referenced content relationship field", () => {
       const customType: CustomType = {
         id: "customType",
         label: "Custom Type",
@@ -612,76 +582,21 @@ describe("ContentRelationshipFieldPicker", () => {
             booleanField: {
               type: "Boolean",
             },
-            typeUid: {
-              type: "UID",
-            },
-            uid: {
-              type: "Boolean",
-            },
-            choice: {
-              type: "Choice",
-              config: {
-                choices: {
-                  choice1: {
-                    type: "Boolean",
-                  },
-                },
-              },
-            },
-            slices: {
-              type: "Slices",
-              config: {
-                choices: {
-                  slice1: {
-                    type: "SharedSlice",
-                  },
-                },
-              },
-            },
           },
         },
       };
-
-      const result = convertLinkCustomtypesToFieldCheckMap({
-        linkCustomtypes: [
-          {
-            id: "customType",
-            fields: ["booleanField", "typeUid", "uid", "choice", "slices"],
-          },
-        ],
-        allCustomTypes: [customType],
-      });
-
-      expect(result).toEqual({
-        customType: {
-          booleanField: {
-            type: "checkbox",
-            value: true,
-          },
-        },
-      });
-    });
-
-    it("should include a correctly referenced group field", () => {
-      const customType: CustomType = {
-        id: "customType",
-        label: "Custom Type",
+      const customTypeWithContentRelationship: CustomType = {
+        id: "customTypeWithContentRelationship",
+        label: "Custom Type With Content Relationship",
         repeatable: false,
         status: true,
         json: {
           Main: {
-            groupField: {
-              type: "Group",
+            contentRelationshipField: {
+              type: "Link",
               config: {
-                label: "Group Field",
-                fields: {
-                  booleanField: {
-                    type: "Boolean",
-                    config: {
-                      label: "Boolean Field",
-                    },
-                  },
-                },
+                select: "document",
+                customtypes: ["customType"],
               },
             },
           },
@@ -691,26 +606,33 @@ describe("ContentRelationshipFieldPicker", () => {
       const result = convertLinkCustomtypesToFieldCheckMap({
         linkCustomtypes: [
           {
-            id: "customType",
+            id: "customTypeWithContentRelationship",
             fields: [
               {
-                id: "groupField",
-                fields: ["booleanField"],
+                id: "contentRelationshipField",
+                customtypes: [
+                  {
+                    id: "customType",
+                    fields: ["booleanField"],
+                  },
+                ],
               },
             ],
           },
         ],
-        allCustomTypes: [customType],
+        allCustomTypes: [customType, customTypeWithContentRelationship],
       });
 
       expect(result).toEqual({
-        customType: {
-          groupField: {
-            type: "group",
+        customTypeWithContentRelationship: {
+          contentRelationshipField: {
+            type: "contentRelationship",
             value: {
-              booleanField: {
-                type: "checkbox",
-                value: true,
+              customType: {
+                booleanField: {
+                  type: "checkbox",
+                  value: true,
+                },
               },
             },
           },
@@ -809,7 +731,187 @@ describe("ContentRelationshipFieldPicker", () => {
       });
     });
 
-    it("should not include a field referenced as a group field when it's not one", () => {
+    it("should discard non-existing/invalid referenced fields", () => {
+      const customType2: CustomType = {
+        id: "customType2",
+        label: "Custom Type 2",
+        repeatable: false,
+        status: true,
+        json: {
+          Main: {
+            booleanField: {
+              type: "Boolean",
+            },
+          },
+        },
+      };
+
+      const customType: CustomType = {
+        id: "customType",
+        label: "Custom Type",
+        repeatable: false,
+        status: true,
+        json: {
+          Main: {
+            mdField: {
+              type: "StructuredText",
+            },
+            crField: {
+              type: "Link",
+              config: {
+                select: "document",
+                customtypes: ["customType2"],
+              },
+            },
+            groupField: {
+              type: "Group",
+              config: {
+                fields: {
+                  groupFieldA: {
+                    type: "Boolean",
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+
+      const result = convertLinkCustomtypesToFieldCheckMap({
+        linkCustomtypes: [
+          {
+            id: "customType",
+            fields: [
+              "mdField",
+              "nonExistingField",
+              {
+                id: "nonExistingGroup",
+                fields: ["groupFieldA"],
+              },
+              {
+                id: "crField",
+                customtypes: [
+                  {
+                    id: "customType2",
+                    fields: ["nonExistingNestedField"],
+                  },
+                ],
+              },
+              {
+                id: "groupField",
+                fields: ["nonExistingGroupField"],
+              },
+            ],
+          },
+        ],
+        allCustomTypes: [customType, customType2],
+      });
+
+      expect(result).toEqual({
+        customType: {
+          mdField: {
+            type: "checkbox",
+            value: true,
+          },
+        },
+      });
+    });
+
+    it("should discard invalid fields (uid, slices & choice)", () => {
+      const customType: CustomType = {
+        id: "customType",
+        label: "Custom Type",
+        repeatable: false,
+        status: true,
+        json: {
+          Main: {
+            booleanField: {
+              type: "Boolean",
+            },
+            typeUid: {
+              type: "UID",
+            },
+            uid: {
+              type: "Boolean",
+            },
+            choice: {
+              type: "Choice",
+              config: {
+                choices: {
+                  choice1: {
+                    type: "Boolean",
+                  },
+                },
+              },
+            },
+            slices: {
+              type: "Slices",
+              config: {
+                choices: {
+                  slice1: {
+                    type: "SharedSlice",
+                  },
+                },
+              },
+            },
+          },
+        },
+      };
+
+      const result = convertLinkCustomtypesToFieldCheckMap({
+        linkCustomtypes: [
+          {
+            id: "customType",
+            fields: ["booleanField", "typeUid", "uid", "choice", "slices"],
+          },
+        ],
+        allCustomTypes: [customType],
+      });
+
+      expect(result).toEqual({
+        customType: {
+          booleanField: {
+            type: "checkbox",
+            value: true,
+          },
+        },
+      });
+    });
+
+    it("should discard a regular field referenced as a group field", () => {
+      const customType: CustomType = {
+        id: "customType",
+        label: "Custom Type",
+        repeatable: false,
+        status: true,
+        json: {
+          Main: {
+            booleanField: {
+              type: "Boolean",
+            },
+          },
+        },
+      };
+
+      const result = convertLinkCustomtypesToFieldCheckMap({
+        linkCustomtypes: [
+          {
+            id: "customType",
+            fields: [
+              {
+                id: "booleanField",
+                fields: ["something"],
+              },
+            ],
+          },
+        ],
+        allCustomTypes: [customType],
+      });
+
+      expect(result).toEqual({});
+    });
+
+    it("should discard a regular field referenced as a content relationship field", () => {
       const customType: CustomType = {
         id: "customType",
         label: "Custom Type",
@@ -831,7 +933,7 @@ describe("ContentRelationshipFieldPicker", () => {
             fields: [
               {
                 id: "booleanField",
-                fields: ["fieldA"],
+                customtypes: [],
               },
             ],
           },
@@ -842,7 +944,7 @@ describe("ContentRelationshipFieldPicker", () => {
       expect(result).toEqual({});
     });
 
-    it("should not include a field referencing a group as a regular field (string/no picked fields)", () => {
+    it("should discard a group field referenced as a regular field (string/no picked fields)", () => {
       const customType: CustomType = {
         id: "customType",
         label: "Custom Type",
@@ -915,7 +1017,7 @@ describe("ContentRelationshipFieldPicker", () => {
       expect(result).toEqual({});
     });
 
-    it("should not include a field referenced as a content relationship field when it's not one", () => {
+    it("should discard a content relationship field reference to a regular field", () => {
       const customTypeA: CustomType = {
         id: "customTypeA",
         label: "Custom Type A",
@@ -966,7 +1068,7 @@ describe("ContentRelationshipFieldPicker", () => {
       expect(result).toEqual({});
     });
 
-    it("should not include a content relationship field if it references a non existing custom type", () => {
+    it("should discard a content relationship field if it references a non existing custom type", () => {
       const customTypeWithField: CustomType = {
         id: "customTypeWithField",
         label: "Custom Type With Field",
@@ -1052,10 +1154,10 @@ describe("ContentRelationshipFieldPicker", () => {
       expect(result).toEqual({});
     });
 
-    it("should not include a regular field referenced as a content relationship field", () => {
-      const customType: CustomType = {
-        id: "customType",
-        label: "Custom Type",
+    it("should not consider content relationship fields referenced at a depth above 2", () => {
+      const thirdCustomType: CustomType = {
+        id: "thirdCustomType",
+        label: "Third Custom Type",
         repeatable: false,
         status: true,
         json: {
@@ -1066,35 +1168,36 @@ describe("ContentRelationshipFieldPicker", () => {
           },
         },
       };
-
-      const result = convertLinkCustomtypesToFieldCheckMap({
-        linkCustomtypes: [
-          {
-            id: "customType",
-            fields: [
-              {
-                id: "booleanField",
-                customtypes: [],
+      const secondCustomType: CustomType = {
+        id: "secondCustomType",
+        label: "Second Custom Type",
+        repeatable: false,
+        status: true,
+        json: {
+          Main: {
+            secondCr: {
+              type: "Link",
+              config: {
+                select: "document",
+                customtypes: ["customType2"],
               },
-            ],
+            },
           },
-        ],
-        allCustomTypes: [customType],
-      });
-
-      expect(result).toEqual({});
-    });
-
-    it("should not include a regular field referenced as a group field", () => {
-      const customType: CustomType = {
-        id: "customType",
-        label: "Custom Type",
+        },
+      };
+      const firstCustomType: CustomType = {
+        id: "firstCustomType",
+        label: "First Custom Type",
         repeatable: false,
         status: true,
         json: {
           Main: {
-            booleanField: {
-              type: "Boolean",
+            firstCr: {
+              type: "Link",
+              config: {
+                select: "document",
+                customtypes: ["customType"],
+              },
             },
           },
         },
@@ -1103,16 +1206,31 @@ describe("ContentRelationshipFieldPicker", () => {
       const result = convertLinkCustomtypesToFieldCheckMap({
         linkCustomtypes: [
           {
-            id: "customType",
+            id: "firstCustomType",
             fields: [
               {
-                id: "booleanField",
-                fields: [],
+                id: "firstCr",
+                customtypes: [
+                  {
+                    id: "secondCustomType",
+                    fields: [
+                      {
+                        id: "secondCr",
+                        // @ts-expect-error - this is a test
+                        customtypes: [
+                          {
+                            id: "thirdCustomType",
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
               },
             ],
           },
         ],
-        allCustomTypes: [customType],
+        allCustomTypes: [secondCustomType, thirdCustomType, firstCustomType],
       });
 
       expect(result).toEqual({});