feat: rebase dev to next

docs/DEPLOY_WEBINY_PROJECT_CF_TEMPLATE.yaml

@@ -233,6 +233,7 @@ Resources:
               # https://www.webiny.com/docs/architecture/introduction#different-database-setups
               - Effect: Allow
                 Action:
+                  - iam:GetRole
                   - iam:CreateServiceLinkedRole
                 Resource:
                   - arn:aws:iam::*:role/aws-service-role/es.amazonaws.com/AWSServiceRoleForAmazonElasticsearchService

packages/api-elasticsearch/src/normalize.ts

@@ -3,18 +3,20 @@
  * @see https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-query-string-query.html#_reserved_characters
  */
 
+const specialCharactersToRemove = [`\\?`];
+
 const specialCharacterToSpace = ["-"];
 
 const specialCharacters = [
     "\\\\",
     "\\+",
     // "\\-",
     "\\=",
-    "\\&\\&",
-    "\\|\\|",
+    `\&`,
+    `\\|`,
     ">",
     "<",
-    "\\!",
+    `\!`,
     "\\(",
     "\\)",
     "\\{",
@@ -25,14 +27,19 @@ const specialCharacters = [
     '\\"',
     "\\~",
     "\\*",
-    "\\?",
-    "\\:",
+    `\:`,
     `\/`,
     "\\#"
 ];
 
 export const normalizeValue = (value: string) => {
     let result = value || "";
+    if (!result) {
+        return result;
+    }
+    for (const character of specialCharactersToRemove) {
+        result = result.replace(new RegExp(character, "g"), "");
+    }
     for (const character of specialCharacterToSpace) {
         result = result.replace(new RegExp(character, "g"), " ");
     }
@@ -44,6 +51,13 @@ export const normalizeValue = (value: string) => {
     return result || "";
 };
 
+const hasSpecialChar = (value: string): boolean | null => {
+    if (!value) {
+        return null;
+    }
+    return value.match(/^([0-9a-zA-Z]+)$/i) === null;
+};
+
 export const normalizeValueWithAsterisk = (initial: string) => {
     const value = normalizeValue(initial);
     const results = value.split(" ");
@@ -53,14 +67,14 @@ export const normalizeValueWithAsterisk = (initial: string) => {
      * If there is a / in the first word, do not put asterisk in front of it.
      */
     const firstWord = results[0];
-    if (firstWord && firstWord.includes("/") === false) {
+    if (hasSpecialChar(firstWord) === false) {
         result = `*${result}`;
     }
     /**
      * If there is a / in the last word, do not put asterisk at the end of it.
      */
     const lastWord = results[results.length - 1];
-    if (lastWord && lastWord.includes("/") === false) {
+    if (hasSpecialChar(lastWord) === false) {
         result = `${result}*`;
     }
 

packages/api-headless-cms-ddb/__tests__/operations/entry/filtering/filter.test.ts

@@ -204,9 +204,7 @@ describe("filtering", () => {
             fields
         });
 
-        expect(resultNumber3).toHaveLength(0);
-
-        expect(resultNumber3).toMatchObject([]);
+        expect(resultNumber3).toHaveLength(19);
     });
 
     it("should filter by nested options variant colors", async () => {

packages/api-headless-cms/__tests__/contentAPI/search.test.ts

@@ -1,7 +1,12 @@
 import { useFruitManageHandler } from "~tests/testHelpers/useFruitManageHandler";
 import { setupContentModelGroup, setupContentModels } from "~tests/testHelpers/setup";
+import { useCategoryManageHandler } from "~tests/testHelpers/useCategoryManageHandler";
+import { toSlug } from "~/utils/toSlug";
 
 describe("search", () => {
+    const categoryManager = useCategoryManageHandler({
+        path: "manage/en-US"
+    });
     const fruitManager = useFruitManageHandler({
         path: "manage/en-US"
     });
@@ -13,6 +18,7 @@ describe("search", () => {
         });
 
         if (response.data.createFruit.error) {
+            console.log(JSON.stringify(response.data.createFruit.error, null, 2));
             throw new Error(response.data.createFruit.error.message);
         }
         return response.data.createFruit.data;
@@ -41,11 +47,11 @@ describe("search", () => {
 
     const setupFruits = async (input?: string[]) => {
         const group = await setupContentModelGroup(fruitManager);
-        await setupContentModels(fruitManager, group, ["fruit"]);
+        await setupContentModels(fruitManager, group, ["fruit", "category"]);
         return createFruits(input);
     };
 
-    it.skip("should find record with dash in the middle of two words", async () => {
+    it("should find record with dash in the middle of two words", async () => {
         await setupFruits();
         const [response] = await listFruits({
             where: {
@@ -331,4 +337,166 @@ describe("search", () => {
             }
         });
     });
+
+    it("should find a record with special characters in the title", async () => {
+        await setupFruits();
+        const categories = {
+            apple: "A Tasty Fruit: Apple w/ Black Dots?",
+            banana: "A Not So Tasty Fruit: Banana w/ Yellow Dots",
+            orange: "Awesome Fruit: Orange w/ Leaves",
+            grape: "Wine - An Autumn Fruit: Grape w/ Seeds?",
+            tangerine: "An Autumn Fruit: Tangerine w/ Seeds?",
+            cleaning: "Clean Building Day | The Ultimate Cleaning Trick Tips!",
+            car: "2001 CarMaker Car type: SVO Reborn? - Burn Epi. 917"
+        };
+        const results: any[] = [];
+        for (const title of Object.values(categories)) {
+            const [result] = await categoryManager.createCategory({
+                data: {
+                    title,
+                    slug: toSlug(title)
+                }
+            });
+            results.push(result?.data?.createCategory?.data);
+        }
+        expect(results).toHaveLength(Object.values(categories).length);
+
+        const [initialResponse] = await categoryManager.listCategories({
+            sort: ["createdOn_ASC"]
+        });
+        expect(initialResponse).toMatchObject({
+            data: {
+                listCategories: {
+                    data: expect.any(Array),
+                    meta: {
+                        totalCount: Object.values(categories).length,
+                        hasMoreItems: false,
+                        cursor: null
+                    },
+                    error: null
+                }
+            }
+        });
+
+        const [appleListResponse] = await categoryManager.listCategories({
+            where: {
+                title_contains: "tasty fruit: apple w/ black dots"
+            }
+        });
+        expect(appleListResponse).toMatchObject({
+            data: {
+                listCategories: {
+                    data: [
+                        {
+                            title: categories.apple
+                        }
+                    ],
+                    meta: {
+                        totalCount: 1,
+                        hasMoreItems: false,
+                        cursor: null
+                    },
+                    error: null
+                }
+            }
+        });
+
+        const [dotsListResponse] = await categoryManager.listCategories({
+            where: {
+                title_contains: "tasty fruit: w/ dots"
+            }
+        });
+        expect(dotsListResponse).toMatchObject({
+            data: {
+                listCategories: {
+                    data: [
+                        {
+                            title: categories.banana
+                        },
+                        {
+                            title: categories.apple
+                        }
+                    ],
+                    meta: {
+                        totalCount: 2,
+                        hasMoreItems: false,
+                        cursor: null
+                    },
+                    error: null
+                }
+            }
+        });
+
+        const [questionMarksListResponse] = await categoryManager.listCategories({
+            where: {
+                title_contains: "autumn fruit: seeds?"
+            }
+        });
+        expect(questionMarksListResponse).toMatchObject({
+            data: {
+                listCategories: {
+                    data: [
+                        {
+                            title: categories.tangerine
+                        },
+                        {
+                            title: categories.grape
+                        }
+                    ],
+                    meta: {
+                        totalCount: 2,
+                        hasMoreItems: false,
+                        cursor: null
+                    },
+                    error: null
+                }
+            }
+        });
+
+        const [cleaningListResponse] = await categoryManager.listCategories({
+            where: {
+                title_contains: "Clean Building Day | The Ultimate Cleaning Trick Tips!"
+            }
+        });
+        expect(cleaningListResponse).toMatchObject({
+            data: {
+                listCategories: {
+                    data: [
+                        {
+                            title: categories.cleaning
+                        }
+                    ],
+                    meta: {
+                        totalCount: 1,
+                        hasMoreItems: false,
+                        cursor: null
+                    },
+                    error: null
+                }
+            }
+        });
+
+        const [carListResponse] = await categoryManager.listCategories({
+            where: {
+                title_contains: "2001 CarMaker Car type: SVO Reborn? - Burn Epi. 917"
+            }
+        });
+        expect(carListResponse).toMatchObject({
+            data: {
+                listCategories: {
+                    data: [
+                        {
+                            title: categories.car
+                        }
+                    ],
+                    meta: {
+                        totalCount: 1,
+                        hasMoreItems: false,
+                        cursor: null
+                    },
+                    error: null
+                }
+            }
+        });
+    });
 });

packages/api-headless-cms/__tests__/testHelpers/usePageManageHandler.ts

@@ -37,6 +37,27 @@ const pageFields = `
             _templateId
             __typename
         }
+        ...on ${singularPageApiName}_Content_Author {
+            author {
+                id
+                modelId
+            }
+            authors {
+                id
+                modelId
+            }
+            _templateId
+            dynamicZone {
+                __typename
+                ... on ${singularPageApiName}_Content_Objecting_DynamicZone_SuperNestedObject {
+                    authors {
+                        id
+                        modelId
+                    }
+                }
+            }
+            __typename
+        }
         ...on ${singularPageApiName}_Content_Author {
             author {
                 id

packages/api-headless-cms/src/crud/contentEntry/referenceFieldsMapping.ts

@@ -287,12 +287,14 @@ async function validateReferencedEntries({
     /**
      * Load all models and use only those used in the input references.
      */
-    const models = (await context.cms.listModels()).filter(model => {
-        const entries = referencesByModel.get(model.modelId);
-        if (!entries || !entries.length) {
-            return false;
-        }
-        return true;
+    const models = await context.security.withoutAuthorization(async () => {
+        return (await context.cms.listModels()).filter(model => {
+            const entries = referencesByModel.get(model.modelId);
+            if (!entries?.length) {
+                return false;
+            }
+            return true;
+        });
     });
 
     if (!models.length) {
@@ -302,8 +304,10 @@ async function validateReferencedEntries({
     /**
      * Load all the entries by their IDs.
      */
-    const promises = models.map(model => {
-        return context.cms.getEntriesByIds(model, referencesByModel.get(model.modelId) || []);
+    const promises = await context.security.withoutAuthorization(async () => {
+        return models.map(model => {
+            return context.cms.getEntriesByIds(model, referencesByModel.get(model.modelId) || []);
+        });
     });
 
     const allEntries = await Promise.all(promises).then(res => res.flat());

packages/api-page-builder-import-export/src/import/process/blocks/importBlock.ts

@@ -77,7 +77,7 @@ export async function importBlock({
     if (category) {
         loadedCategory = await context.pageBuilder.getBlockCategory(category?.slug);
         if (!loadedCategory) {
-            await context.pageBuilder.createBlockCategory({
+            loadedCategory = await context.pageBuilder.createBlockCategory({
                 name: category.name,
                 slug: category.slug,
                 icon: category.icon,

packages/api-page-builder/src/graphql/crud/pages.crud.ts

@@ -943,10 +943,10 @@ export const createPageCrud = (params: CreatePageCrudParams): PagesCrud => {
                 });
 
                 const newPublishedPageRaw = await storageOperations.pages.publish({
-                    original,
-                    page,
-                    latestPage,
-                    publishedPage,
+                    original: await compressPage(original),
+                    page: await compressPage(page),
+                    latestPage: await compressPage(latestPage),
+                    publishedPage: publishedPage ? await compressPage(publishedPage) : null,
                     publishedPathPage
                 });