Support type wysiwyg instead of appearance param

MartinN3 · Jul 23, 2019 · 1dea89c · 1dea89c
1 parent 3fdc149
commit 1dea89c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 50 deletions.
diff --git a/cypress/fixtures/api/product.json b/cypress/fixtures/api/product.json
@@ -13,10 +13,7 @@
     {
       "name": "description",
       "params": {
-        "type": "text",
-        "appearance": {
-          "WYSIWYG": false
-        }
+        "type": "text"
       }
     },
     {
@@ -56,4 +53,4 @@
       }
     }
   ]
-}
+}
diff --git a/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js b/packages/strapi-hook-bookshelf/lib/buildDatabaseSchema.js
@@ -365,6 +365,7 @@ const getType = ({ definition, attribute, name, tableExists = false }) => {
   switch (attribute.type) {
     case 'uuid':
       return client === 'pg' ? 'uuid' : 'varchar(36)';
+    case 'wysiwyg':
     case 'text':
       return client === 'pg' ? 'text' : 'longtext';
     case 'json':

diff --git a/packages/strapi-hook-mongoose/lib/utils/index.js b/packages/strapi-hook-mongoose/lib/utils/index.js
@@ -55,6 +55,7 @@ module.exports = (mongoose = Mongoose) => {
       case 'password':
       case 'string':
       case 'text':
+      case 'wysiwyg':
         return 'String';
       default:
         return undefined;

diff --git a/packages/strapi-plugin-graphql/test/graphqlCrud.test.e2e.js b/packages/strapi-plugin-graphql/test/graphqlCrud.test.e2e.js
@@ -12,11 +12,8 @@ const postModel = {
     {
       name: 'name',
       params: {
-        appearance: {
-          WYSIWYG: false,
-        },
         multiple: false,
-        type: 'string',
+        type: 'wysiwyg',
       },
     },
     {

diff --git a/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js b/packages/strapi-plugin-graphql/test/graphqlRelations.test.e2e.js
@@ -16,21 +16,15 @@ const documentModel = {
     {
       name: 'name',
       params: {
-        appearance: {
-          WYSIWYG: false,
-        },
         multiple: false,
-        type: 'string',
+        type: 'wysiwyg',
       },
     },
     {
       name: 'content',
       params: {
-        appearance: {
-          WYSIWYG: true,
-        },
         multiple: false,
-        type: 'text',
+        type: 'wysiwyg',
       },
     },
   ],
@@ -45,11 +39,8 @@ const labelModel = {
     {
       name: 'name',
       params: {
-        appearance: {
-          WYSIWYG: false,
-        },
         multiple: false,
-        type: 'string',
+        type: 'wysiwyg',
       },
     },
     {

diff --git a/test/helpers/generators.js b/test/helpers/generators.js
@@ -4,21 +4,15 @@ module.exports = {
       {
         name: 'title',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'string',
         },
       },
       {
         name: 'content',
         params: {
-          appearance: {
-            WYSIWYG: true,
-          },
           multiple: false,
-          type: 'text',
+          type: 'wysiwyg',
         },
       },
       {
@@ -42,9 +36,6 @@ module.exports = {
       {
         name: 'name',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'string',
         },
@@ -69,9 +60,6 @@ module.exports = {
       {
         name: 'name',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'string',
         },
@@ -95,9 +83,6 @@ module.exports = {
       {
         name: 'name',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'string',
         },
@@ -128,29 +113,20 @@ module.exports = {
       {
         name: 'name',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'string',
         },
       },
       {
         name: 'description',
         params: {
-          appearance: {
-            WYSIWYG: true,
-          },
           multiple: false,
-          type: 'text',
+          type: 'wysiwyg',
         },
       },
       {
         name: 'published',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'boolean',
         },
@@ -166,9 +142,6 @@ module.exports = {
       {
         name: 'title',
         params: {
-          appearance: {
-            WYSIWYG: false,
-          },
           multiple: false,
           type: 'string',
         },