Merge branch 'development' of github.com:Webiny/webiny-js into develo…

…pment
webiny · Feb 14, 2019 · da31c55 · da31c55
2 parents 56d9f57 + 2f6dbae
commit da31c55
Show file tree

Hide file tree

Showing 53 changed files with 605 additions and 382 deletions.
diff --git a/independent/webiny-cli/src/init/template/packages/admin/src/config/development.js b/independent/webiny-cli/src/init/template/packages/admin/src/config/development.js
@@ -33,16 +33,5 @@ export default {
                 errorPolicy: "all"
             }
         }
-    }),
-    components: {
-        Image: {
-            presets: {
-                avatar: { width: 128 }
-            },
-            plugin: "image-component"
-        },
-        withFileUpload: {
-            plugin: ["with-file-upload", { uri: "/files" }]
-        }
-    }
+    })
 };
diff --git a/independent/webiny-cli/src/init/template/packages/admin/src/config/production.js b/independent/webiny-cli/src/init/template/packages/admin/src/config/production.js
@@ -23,16 +23,5 @@ export default {
             addTypename: true,
             dataIdFromObject: obj => obj.id || null
         })
-    }),
-    components: {
-        Image: {
-            presets: {
-                avatar: { width: 128 }
-            },
-            plugin: "image-component"
-        },
-        withFileUpload: {
-            plugin: ["with-file-upload", { uri: "/files" }]
-        }
-    }
+    })
 };
diff --git a/...ent/webiny-integration-cookie-policy/src/plugins/admin/components/CookiePolicySettings.js b/...ent/webiny-integration-cookie-policy/src/plugins/admin/components/CookiePolicySettings.js
@@ -11,6 +11,7 @@ import { withSnackbar } from "webiny-admin/components";
 import { RadioGroup, Radio } from "webiny-ui/Radio";
 import graphql from "./graphql";
 import showCookiePolicy from "./../../utils/showCookiePolicy";
+import { CircularProgress } from "webiny-ui/Progress";
 
 import {
     SimpleForm,
@@ -29,9 +30,9 @@ const positionOptions = [
 const CookiePolicySettings = ({ showSnackbar }) => {
     return (
         <Query query={graphql.query}>
-            {({ data }) => (
+            {({ data, loading: queryInProgress }) => (
                 <Mutation mutation={graphql.mutation}>
-                    {update => (
+                    {(update, { loading: mutationInProgress }) => (
                         <Form
                             data={data.settings}
                             onSubmit={async data => {
@@ -45,6 +46,9 @@ const CookiePolicySettings = ({ showSnackbar }) => {
                         >
                             {({ Bind, form, data }) => (
                                 <SimpleForm>
+                                    {(queryInProgress || mutationInProgress) && (
+                                        <CircularProgress />
+                                    )}
                                     <SimpleFormHeader title="Cookie Policy Settings">
                                         <Bind
                                             name={"cookiePolicy.enabled"}

diff --git a/...y-integration-google-tag-manager/src/plugins/admin/components/GoogleTagManagerSettings.js b/...y-integration-google-tag-manager/src/plugins/admin/components/GoogleTagManagerSettings.js
@@ -8,6 +8,7 @@ import { Query, Mutation } from "react-apollo";
 import { withSnackbar } from "webiny-admin/components";
 import { Input } from "webiny-ui/Input";
 import graphql from "./graphql";
+import { CircularProgress } from "webiny-ui/Progress";
 
 import {
     SimpleForm,
@@ -19,9 +20,9 @@ import {
 const GoogleTagManagerSettings = ({ showSnackbar }) => {
     return (
         <Query query={graphql.query}>
-            {({ data }) => (
+            {({ data, loading: queryInProgress }) => (
                 <Mutation mutation={graphql.mutation}>
-                    {update => (
+                    {(update, { loading: mutationInProgress }) => (
                         <Form
                             data={data.settings}
                             onSubmit={async data => {
@@ -35,6 +36,9 @@ const GoogleTagManagerSettings = ({ showSnackbar }) => {
                         >
                             {({ Bind, form, data }) => (
                                 <SimpleForm>
+                                    {(queryInProgress || mutationInProgress) && (
+                                        <CircularProgress />
+                                    )}
                                     <SimpleFormHeader title="Google Tag Manager Settings">
                                         <Bind
                                             name={"googleTagManager.enabled"}

diff --git a/independent/webiny-integration-mailchimp/src/plugins/admin/components/MailchimpSettings.js b/independent/webiny-integration-mailchimp/src/plugins/admin/components/MailchimpSettings.js
@@ -8,6 +8,7 @@ import { ButtonPrimary } from "webiny-ui/Button";
 import { Query, Mutation } from "react-apollo";
 import { withSnackbar } from "webiny-admin/components";
 import graphql from "./graphql";
+import { CircularProgress } from "webiny-ui/Progress";
 
 import {
     SimpleForm,
@@ -19,9 +20,9 @@ import {
 const MailchimpSettings = ({ showSnackbar }) => {
     return (
         <Query query={graphql.query}>
-            {({ data }) => (
+            {({ data, loading: queryInProgress }) => (
                 <Mutation mutation={graphql.mutation}>
-                    {update => (
+                    {(update, { loading: mutationInProgress }) => (
                         <Form
                             data={data.settings}
                             onSubmit={async data => {
@@ -35,6 +36,9 @@ const MailchimpSettings = ({ showSnackbar }) => {
                         >
                             {({ Bind, form, data }) => (
                                 <SimpleForm>
+                                    {(queryInProgress || mutationInProgress) && (
+                                        <CircularProgress />
+                                    )}
                                     <SimpleFormHeader title="Mailchimp Settings">
                                         <Bind
                                             name={"mailchimp.enabled"}

diff --git a/packages/webiny-admin/src/components/withCrud.js b/packages/webiny-admin/src/components/withCrud.js
@@ -21,6 +21,7 @@ export type WithCrudListProps = WithCrudBaseProps & {
 
 export type WithCrudFormProps = WithCrudBaseProps & {
     invalidFields: Object,
+    loading: boolean,
     onSubmit: (data: Object) => void,
     data: Object,
     error: Object | null
@@ -70,19 +71,22 @@ const withSaveHandler = ({ create, update, response, variables, snackbar }): Fun
         return compose(
             setDisplayName("saveHandler"),
             withState("invalidFields", "setInvalidFields", {}),
+            withState("mutationInProgress", "setMutationInProgress", false),
             graphql(create, { name: "createRecord" }),
             graphql(update, { name: "updateRecord" }),
             withHandlers({
                 saveRecord: ({
                     createRecord,
                     updateRecord,
+                    setMutationInProgress,
                     setInvalidFields,
                     showSnackbar,
                     showDialog,
                     router,
                     dataList,
                     id
                 }: Object) => {
+                    setMutationInProgress(true);
                     return async (formData: Object) => {
                         // Reset errors
                         setInvalidFields(null);
@@ -91,24 +95,29 @@ const withSaveHandler = ({ create, update, response, variables, snackbar }): Fun
                         const operation = id
                             ? updateRecord({ variables: { id, ...gqlVariables } })
                             : createRecord({ variables: gqlVariables });
-                        return operation.then(res => {
-                            const { data, error } = response(res.data);
-                            if (error) {
-                                if (error.code === "INVALID_ATTRIBUTES") {
-                                    showSnackbar("Some of your form input is incorrect!");
-                                    setInvalidFields(error.data.invalidAttributes);
-                                    return;
-                                } else {
-                                    showDialog(error.message, {
-                                        title: "Something unexpected happened"
-                                    });
-                                    return;
+                        return operation
+                            .then(res => {
+                                const { data, error } = response(res.data);
+                                if (error) {
+                                    if (error.code === "INVALID_ATTRIBUTES") {
+                                        showSnackbar("Some of your form input is incorrect!");
+                                        setInvalidFields(error.data.invalidAttributes);
+                                        return;
+                                    } else {
+                                        showDialog(error.message, {
+                                            title: "Something unexpected happened"
+                                        });
+                                        return;
+                                    }
                                 }
-                            }
-                            showSnackbar(snackbar(data));
-                            router.goToRoute({ params: { id: data.id }, merge: true });
-                            !id && dataList.refresh();
-                        });
+                                showSnackbar(snackbar(data));
+                                router.goToRoute({ params: { id: data.id }, merge: true });
+                                !id && dataList.refresh();
+                            })
+                            .then(res => {
+                                setMutationInProgress(false);
+                                return res;
+                            });
                     };
                 }
             })
@@ -163,6 +172,7 @@ export const withCrud = ({ list, form }: Object): Function => {
                         dataList,
                         saveRecord,
                         formData,
+                        mutationInProgress,
                         invalidFields,
                         showSnackbar,
                         showDialog,
@@ -184,6 +194,7 @@ export const withCrud = ({ list, form }: Object): Function => {
                             ...formData,
                             invalidFields,
                             onSubmit: saveRecord,
+                            loading: formData && formData.loading || mutationInProgress,
                             router,
                             showSnackbar,
                             showDialog

diff --git a/packages/webiny-admin/src/components/withCrud/getFormData.js b/packages/webiny-admin/src/components/withCrud/getFormData.js
@@ -31,6 +31,7 @@ const process = ({ data, form }: Object) => {
 const getFormData = ({ data, form }: Object) => {
     const formData = process({ data, form });
     return {
+        loading: get(data, "loading") || false,
         data: get(formData, "data") || {},
         error: get(formData, "error") || null
     };

diff --git a/packages/webiny-api-cms/src/entities/CmsSettings.entity.js b/packages/webiny-api-cms/src/entities/CmsSettings.entity.js
@@ -3,12 +3,13 @@ import { settingsFactory } from "webiny-api/entities";
 import { Model } from "webiny-model";
 import FileModel from "./File.model";
 
-class SocialMedia extends Model {
+class SocialMediaModel extends Model {
     constructor() {
         super();
         this.attr("facebook").char();
         this.attr("twitter").char();
         this.attr("instagram").char();
+        this.attr("image").model(FileModel);
     }
 }
 
@@ -31,7 +32,7 @@ const cmsSettingsModelFactory = () => {
             this.attr("domain").char();
             this.attr("favicon").model(FileModel);
             this.attr("logo").model(FileModel);
-            this.attr("social").model(SocialMedia);
+            this.attr("social").model(SocialMediaModel);
         }
     };
 };

diff --git a/packages/webiny-api-cms/src/install/plugins/importData.js b/packages/webiny-api-cms/src/install/plugins/importData.js
@@ -3,7 +3,7 @@ import setupEntities from "./setupEntities";
 import createDefaultPages from "./importData/createDefaultPages";
 import createDefaultBlocks from "./importData/createDefaultBlocks";
 import * as data from "./data";
-
+import {get} from "lodash";
 export default async (context: Object) => {
     setupEntities(context);
     const { Category, Menu, CmsSettings } = context.cms.entities;
@@ -65,7 +65,7 @@ export default async (context: Object) => {
     // Settings init.
     const cmsSettings = new CmsSettings();
     await createDefaultPages(context, { categories, cmsSettings });
-    cmsSettings.data.domain = "http://localhost:3002";
+    cmsSettings.data.domain = get(context, "cms.siteUrl");
 
     await cmsSettings.save();
 };
diff --git a/packages/webiny-api-cms/src/plugins/settings/index.js b/packages/webiny-api-cms/src/plugins/settings/index.js
@@ -11,6 +11,7 @@ export default [
                 facebook: String
                 twitter: String
                 instagram: String
+                image: File
             }
 
             type CmsSettings {
@@ -38,6 +39,7 @@ export default [
                 facebook: String
                 twitter: String
                 instagram: String
+                image: FileInput
             }
 
             input CmsDefaultPageInput {

diff --git a/packages/webiny-app-cms/src/admin/plugins/routes.js b/packages/webiny-app-cms/src/admin/plugins/routes.js
@@ -2,7 +2,7 @@
 import React from "react";
 import AdminLayout from "webiny-admin/components/Layouts/AdminLayout";
 import Categories from "webiny-app-cms/admin/views/Categories/Categories";
-// import Menus from "webiny-app-cms/admin/views/Menus/Menus";
+import Menus from "webiny-app-cms/admin/views/Menus/Menus";
 import Pages from "webiny-app-cms/admin/views/Pages/Pages";
 import Editor from "webiny-app-cms/admin/views/Pages/Editor";
 import { SecureRoute } from "webiny-app-security/components";
@@ -29,7 +29,27 @@ export default [
             }
         }
     },
-
+    {
+        name: "route-cms-menus",
+        type: "route",
+        route: {
+            name: "Cms.Menus",
+            path: "/cms/menus",
+            exact: true,
+            render() {
+                return (
+                    <SecureRoute roles={["cms-menus"]}>
+                        <Helmet>
+                            <title>CMS - Menus</title>
+                        </Helmet>
+                        <AdminLayout>
+                            <Menus />
+                        </AdminLayout>
+                    </SecureRoute>
+                );
+            }
+        }
+    },
     {
         name: "route-cms-pages",
         type: "route",