Fixed pages auto-complete and related GQL fields.

webiny · Mar 1, 2019 · 9d48741 · 9d48741
1 parent 28a6cb9
commit 9d48741
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 81 deletions.
diff --git a/packages/demo-api/package.json b/packages/demo-api/package.json
@@ -33,6 +33,7 @@
     "webiny-plugins": "0.0.0"
   },
   "devDependencies": {
+    "inquirer": "^6.2.0",
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.0.0",
     "@babel/plugin-external-helpers": "^7.0.0",

diff --git a/packages/webiny-api-cms/src/plugins/graphql/Page.js b/packages/webiny-api-cms/src/plugins/graphql/Page.js
@@ -6,7 +6,6 @@ import {
     resolveGet,
     resolveList
 } from "webiny-api/graphql";
-import { Response } from "webiny-api/graphql/responses";
 import UserType from "webiny-api-security/plugins/graphql/User";
 import createRevisionFrom from "./pageResolvers/createRevisionFrom";
 import listPages from "./pageResolvers/listPages";
@@ -138,7 +137,7 @@ export default {
                 sort: String
             ): PageResponse
             
-            getPublishedPage(id: String, url: String): PageResponse
+            getPublishedPage(id: String, url: String, parent: String): PageResponse
             
             # Returns page set as home page (managed in CMS settings).
             getHomePage: PageResponse
@@ -158,7 +157,9 @@ export default {
             ): PageListResponse
             
             listPublishedPages(
+                search: String
                 category: String
+                parent: String
                 tags: [String]
                 tagsRule: TagsRule
                 sort: PageSortInput

diff --git a/packages/webiny-api-cms/src/plugins/graphql/pageResolvers/listPublishedPages.js b/packages/webiny-api-cms/src/plugins/graphql/pageResolvers/listPublishedPages.js
@@ -5,6 +5,7 @@ import get from "lodash/get";
 export const listPublishedPages = async ({ args, Page, Category }: Object) => {
     const {
         page = 1,
+        search,
         perPage = 10,
         category = null,
         parent = null,
@@ -41,6 +42,10 @@ export const listPublishedPages = async ({ args, Page, Category }: Object) => {
         }
     }
 
+    if (search) {
+        baseFilters.push({ title: { $regex: `.*${search}.*`, $options: "i" } });
+    }
+
     if (category) {
         if (Category.isId(category)) {
             baseFilters.push({ category });

diff --git a/.../settings/components/PagesAutoComplete.js → ...src/admin/components/PagesAutoComplete.js b/.../settings/components/PagesAutoComplete.js → ...src/admin/components/PagesAutoComplete.js
@@ -9,9 +9,9 @@ import { Query } from "react-apollo";
 
 // We utilize the same "listPages" GraphQL field.
 const getPage = gql`
-    query listPages($parent: String) {
+    query getPublishedPage($parent: String) {
         cms {
-            pages: listPages(parent: $parent) {
+            page: getPublishedPage(parent: $parent) {
                 data {
                     parent
                     published
@@ -23,9 +23,9 @@ const getPage = gql`
 `;
 
 const listPages = gql`
-    query listPages($search: String) {
+    query listPublishedPages($search: String) {
         cms {
-            pages: listPages(search: $search) {
+            pages: listPublishedPages(search: $search) {
                 data {
                     parent
                     published
@@ -39,15 +39,9 @@ const listPages = gql`
 const PagesAutoComplete = props => (
     <Query skip={!props.value} variables={{ parent: props.value }} query={getPage}>
         {({ data }) => {
-            const value = get(data, "cms.pages.data.0");
+            const value = get(data, "cms.page.data");
             return (
-                <AutoComplete
-                    {...props}
-                    description={value && !value.published && "Warning: page is not published."}
-                    valueProp={"parent"}
-                    textProp={"title"}
-                    value={value}
-                />
+                <AutoComplete {...props} valueProp={"parent"} textProp={"title"} value={value} />
             );
         }}
     </Query>

diff --git a/packages/webiny-app-cms/src/admin/plugins/menuItems/page/PageForm.js b/packages/webiny-app-cms/src/admin/plugins/menuItems/page/PageForm.js
@@ -5,7 +5,7 @@ import { Input } from "webiny-ui/Input";
 import { Typography } from "webiny-ui/Typography";
 import { Grid, Cell } from "webiny-ui/Grid";
 import { ButtonSecondary, ButtonPrimary } from "webiny-ui/Button";
-import PagesAutoComplete from "./PagesAutoComplete";
+import PagesAutoComplete from "webiny-app-cms/admin/components/PagesAutoComplete";
 import { Elevation } from "webiny-ui/Elevation";
 
 const LinkForm = ({ data, onSubmit, onCancel }: Object) => {

diff --git a/packages/webiny-app-cms/src/admin/plugins/menuItems/page/PagesAutoComplete.js b/packages/webiny-app-cms/src/admin/plugins/menuItems/page/PagesAutoComplete.js
diff --git a/packages/webiny-app-cms/src/admin/plugins/settings/components/CmsSettings.js b/packages/webiny-app-cms/src/admin/plugins/settings/components/CmsSettings.js
@@ -6,7 +6,7 @@ import { ButtonPrimary } from "webiny-ui/Button";
 import { Query, Mutation } from "react-apollo";
 import { withSnackbar } from "webiny-admin/components";
 import graphql from "./graphql";
-import PagesAutoComplete from "./PagesAutoComplete";
+import PagesAutoComplete from "webiny-app-cms/admin/components/PagesAutoComplete";
 import { CircularProgress } from "webiny-ui/Progress";
 import Image from "./Image";