Merge d99c6a1 into d606631

plone · Sep 28, 2018 · 1402cf1 · 1402cf1
2 parents d606631 + d99c6a1
commit 1402cf1
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,8 @@ api/.Python
 api/include
 api/lib
 api/pip-selfcheck.json
+/bin
+/lib
 
 # Tests
 /tests/bin
@@ -42,3 +44,4 @@ log.html
 output.xml
 report.html
 selenium-screenshot-*.png
+/selenium/
diff --git a/g-api/config-local.yml b/g-api/config-local.yml
@@ -21,13 +21,13 @@ static:
 root_user:
   password: root
 auth_extractors:
-- guillotina_cms.extractors.CookiePolicy
+- guillotina.auth.extractors.CookiePolicy
 - guillotina.auth.extractors.BearerAuthPolicy
 - guillotina.auth.extractors.BasicAuthPolicy
 - guillotina.auth.extractors.WSTokenAuthPolicy
 auth_token_validators:
 - guillotina.auth.validators.SaltedHashPasswordValidator
-- guillotina_cms.validator.CMSJWTValidator
+- guillotina.auth.validators.JWTValidator
 redis:
   host: "redis"
   port: 6379

diff --git a/g-api/config.yml b/g-api/config.yml
@@ -21,13 +21,13 @@ static:
 root_user:
   password: root
 auth_extractors:
-- guillotina_cms.extractors.CookiePolicy
+- guillotina.auth.extractors.CookiePolicy
 - guillotina.auth.extractors.BearerAuthPolicy
 - guillotina.auth.extractors.BasicAuthPolicy
 - guillotina.auth.extractors.WSTokenAuthPolicy
 auth_token_validators:
 - guillotina.auth.validators.SaltedHashPasswordValidator
-- guillotina_cms.validator.CMSJWTValidator
+- guillotina.auth.validators.JWTValidator
 redis:
   host: "redis"
   port: 6380

diff --git a/src/components/manage/Form/Form.jsx b/src/components/manage/Form/Form.jsx
@@ -197,11 +197,12 @@ class Form extends Component {
    * @returns {undefined}
    */
   onChangeTile(id, value) {
+    const tilesFieldname = getTilesFieldname(this.state.formData);
     this.setState({
       formData: {
         ...this.state.formData,
         [getTilesFieldname(this.state.formData)]: {
-          ...this.state.formData.tiles,
+          ...this.state.formData[tilesFieldname],
           [id]: value || null,
         },
       },
@@ -237,7 +238,7 @@ class Form extends Component {
         [tilesLayoutFieldname]: {
           items: without(this.state.formData[tilesLayoutFieldname].items, id),
         },
-        tiles: omit(this.state.formData[tilesFieldname], [id]),
+        [tilesFieldname]: omit(this.state.formData[tilesFieldname], [id]),
       },
       selected: selectPrev
         ? this.state.formData[tilesLayoutFieldname].items[
@@ -264,14 +265,14 @@ class Form extends Component {
     this.setState({
       formData: {
         ...this.state.formData,
-        tiles_layout: {
+        [tilesLayoutFieldname]: {
           items: [
             ...this.state.formData[tilesLayoutFieldname].items.slice(0, insert),
             id,
             ...this.state.formData[tilesLayoutFieldname].items.slice(insert),
           ],
         },
-        tiles: {
+        [tilesFieldname]: {
           ...this.state.formData[tilesFieldname],
           [id]: {
             '@type': type,
@@ -350,7 +351,7 @@ class Form extends Component {
     this.setState({
       formData: {
         ...this.state.formData,
-        tiles_layout: {
+        [tilesLayoutFieldname]: {
           items: move(
             this.state.formData[tilesLayoutFieldname].items,
             dragIndex,
@@ -373,7 +374,6 @@ class Form extends Component {
     const tilesLayoutFieldname = getTilesLayoutFieldname(formData);
     const renderTiles = formData[tilesLayoutFieldname].items;
     const tilesDict = formData[tilesFieldname];
-
     return this.props.visual ? (
       <div className="ui wrapper">
         {map(renderTiles, (tile, index) => (

diff --git a/src/config/index.js b/src/config/index.js
@@ -48,8 +48,8 @@ export default defaults(
   {
     host: 'localhost',
     port: '4300',
-    apiPath: 'http://localhost:8080/Plone', // for Plone
+    // apiPath: 'http://localhost:8080/Plone', // for Plone
     publicUrl: '',
-    // apiPath: 'http://localhost:8081/db/web', // for guillotina
+    apiPath: 'http://localhost:8081/db/container', // for guillotina
   },
 );
diff --git a/src/server.jsx b/src/server.jsx
@@ -152,6 +152,7 @@ export default parameters => {
                   res.set({
                     'Cache-Control': 'public, max-age=60, no-transform',
                   });
+                  console.log(error.stack);
                   res
                     .status(500)
                     .send(`<!doctype html> ${renderToStaticMarkup(errorPage)}`);

diff --git a/tests/GuillotinaLibrary.py b/tests/GuillotinaLibrary.py
@@ -1,5 +1,6 @@
 import os
 import logging
+from time import sleep
 import requests
 
 HEADERS = {
@@ -18,7 +19,6 @@ def setup_guillotina(self, base_url):
         for i in range(10):
             resp = s.get(base_url)
             if resp.status_code != 200:
-                logger.warn('Waiting')
                 sleep(2)
             else:
                 break
@@ -43,3 +43,25 @@ def setup_guillotina(self, base_url):
             raise Exception('Warning, could not install cms {}: {}'.format(
                 resp.status_code,
                 resp.content))
+        resp = s.post(
+            os.path.join(base_url, 'container/@sharing'),
+            json={
+            "roleperm":
+            [
+                {
+                    "setting": "AllowSingle",
+                    "role": "guillotina.Anonymous",
+                    "permission": "guillotina.ViewContent"
+                },
+                {
+                    "setting": "AllowSingle",
+                    "role": "guillotina.Anonymous",
+                    "permission": "guillotina.AccessContent"
+                }
+            ]
+        })
+        if resp.status_code not in (200, 201):
+            raise Exception('Warning, could not publish site {}: {}'.format(
+                resp.status_code,
+                resp.content))
+