@kids-reporter/cms-core 0.3.0 → 0.4.0

package/lib/custom-fields/rich-text-editor/index.js

@@ -4,35 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.richTextEditor = void 0;
-
 var _types = require("@keystone-6/core/types");
-
 var _core = require("@keystone-6/core");
-
 const richTextEditor = ({
   defaultValue = null,
   disabledButtons = [],
   ...config
 } = {}) => meta => {
   var _config$db;
-
   if (config.isIndexed === 'unique') {
     throw Error("isIndexed: 'unique' is not a supported option for field type textEditor");
   }
-
   const resolve = val => val === null && meta.provider === 'postgresql' ? 'DbNull' : val;
-
-  return (0, _types.jsonFieldTypePolyfilledForSQLite)(meta.provider, { ...config,
+  return (0, _types.jsonFieldTypePolyfilledForSQLite)(meta.provider, {
+    ...config,
     input: {
       create: {
         arg: _core.graphql.arg({
           type: _core.graphql.JSON
         }),
-
         resolve(val) {
           return resolve(val === undefined ? defaultValue : val);
         }
-
       },
       update: {
         arg: _core.graphql.arg({
@@ -57,5 +50,4 @@ const richTextEditor = ({
     map: (_config$db = config.db) === null || _config$db === void 0 ? void 0 : _config$db.map
   });
 };
-
 exports.richTextEditor = richTextEditor;

package/lib/custom-fields/rich-text-editor/views/index.js

@@ -4,44 +4,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.controller = exports.Field = exports.Cell = exports.CardValue = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _core = require("@keystone-ui/core");
-
 var _fields = require("@keystone-ui/fields");
-
 var _components = require("@keystone-6/core/admin-ui/components");
-
 var _draftJs = require("draft-js");
-
-var _draftEditor = _interopRequireDefault(require("@kids-reporter/draft-editor"));
-
+var _draftEditor = require("@kids-reporter/draft-editor");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // eslint-disable-line
+
 // import { RichTextEditor, decorators } from '@mirrormedia/lilith-draft-editor'
-const {
-  RichTextEditor,
-  decorators
-} = _draftEditor.default.DraftEditor;
 
 const Field = ({
   field,
   value,
   onChange,
   autoFocus // eslint-disable-line
-
 }) => {
-  return /*#__PURE__*/_react.default.createElement(_fields.FieldContainer, null, /*#__PURE__*/_react.default.createElement(_fields.FieldLabel, null, field.label, /*#__PURE__*/_react.default.createElement(_core.Stack, null, /*#__PURE__*/_react.default.createElement(RichTextEditor, {
+  return /*#__PURE__*/_react.default.createElement(_fields.FieldContainer, null, /*#__PURE__*/_react.default.createElement(_fields.FieldLabel, null, field.label, /*#__PURE__*/_react.default.createElement(_core.Stack, null, /*#__PURE__*/_react.default.createElement(_draftEditor.RichTextEditor, {
     disabledButtons: field.disabledButtons,
     editorState: value,
     onChange: editorState => onChange === null || onChange === void 0 ? void 0 : onChange(editorState)
   }))));
 };
-
 exports.Field = Field;
-
 const Cell = ({
   item,
   field,
@@ -50,44 +36,36 @@ const Cell = ({
   const value = item[field.path] + '';
   return linkTo ? /*#__PURE__*/_react.default.createElement(_components.CellLink, linkTo, value) : /*#__PURE__*/_react.default.createElement(_components.CellContainer, null, value);
 };
-
 exports.Cell = Cell;
 Cell.supportsLinkTo = true;
-
 const CardValue = ({
   item,
   field
 }) => {
   return /*#__PURE__*/_react.default.createElement(_fields.FieldContainer, null, /*#__PURE__*/_react.default.createElement(_fields.FieldLabel, null, field.label), item[field.path]);
 };
-
 exports.CardValue = CardValue;
-
 const controller = config => {
   var _config$fieldMeta;
-
   return {
+    description: '',
     disabledButtons: ((_config$fieldMeta = config.fieldMeta) === null || _config$fieldMeta === void 0 ? void 0 : _config$fieldMeta.disabledButtons) ?? [],
     path: config.path,
     label: config.label,
     graphqlSelection: config.path,
-    defaultValue: _draftJs.EditorState.createEmpty(decorators),
+    defaultValue: _draftJs.EditorState.createEmpty(_draftEditor.decorator),
     deserialize: data => {
       const rawContentState = data[config.path];
-
       if (rawContentState === null) {
-        return _draftJs.EditorState.createEmpty(decorators);
+        return _draftJs.EditorState.createEmpty(_draftEditor.decorator);
       }
-
       try {
         const contentState = (0, _draftJs.convertFromRaw)(rawContentState);
-
-        const editorState = _draftJs.EditorState.createWithContent(contentState, decorators);
-
+        const editorState = _draftJs.EditorState.createWithContent(contentState, _draftEditor.decorator);
         return editorState;
       } catch (err) {
         console.error(err);
-        return _draftJs.EditorState.createEmpty(decorators);
+        return _draftJs.EditorState.createEmpty(_draftEditor.decorator);
       }
     },
     serialize: editorState => {
@@ -96,7 +74,6 @@ const controller = config => {
           [config.path]: null
         };
       }
-
       try {
         const rawContentState = (0, _draftJs.convertToRaw)(editorState.getCurrentContent());
         return {
@@ -111,5 +88,4 @@ const controller = config => {
     }
   };
 };
-
 exports.controller = controller;

package/lib/index.js

@@ -11,15 +11,10 @@ Object.defineProperty(exports, "richTextEditorButtonNames", {
   }
 });
 exports.utils = void 0;
-
 var _manualOrderRelationship = _interopRequireDefault(require("./utils/manual-order-relationship"));
-
 var _richTextEditor = require("./custom-fields/rich-text-editor");
-
-var _draftEditor = require("@kids-reporter/draft-editor/lib/draft-editor");
-
+var _draftEditor = require("@kids-reporter/draft-editor");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const customFields = {
   richTextEditor: _richTextEditor.richTextEditor
 };

package/lib/utils/manual-order-relationship.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _core = require("@keystone-6/core");
-
 var _fields = require("@keystone-6/core/fields");
-
 /**
  * For `relationship` field, KeystoneJS won't take user input order into account.
  * Therefore, after the create/update operation is done,
@@ -57,10 +54,8 @@ var _fields = require("@keystone-6/core/fields");
  */
 function addManualOrderRelationshipFields(manualOrderFields = [], list) {
   var _list$hooks;
-
   manualOrderFields.forEach(mo => {
     var _list$fields;
-
     if (!((_list$fields = list.fields) !== null && _list$fields !== void 0 && _list$fields[mo.fieldName])) {
       list.fields[mo.fieldName] = (0, _fields.json)({
         label: mo.fieldLabel,
@@ -70,60 +65,59 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
           }
         }
       });
-    } // add virtual field definition
-
+    }
 
+    // add virtual field definition
     addVirtualFieldToReturnItemsInInputOrder(list, mo);
-  }); // decorate `resolveInput` hook
+  });
 
+  // decorate `resolveInput` hook
   list.hooks = list.hooks || {};
   const originResolveInput = (_list$hooks = list.hooks) === null || _list$hooks === void 0 ? void 0 : _list$hooks.resolveInput;
-
   list.hooks.resolveInput = async props => {
     let resolvedData = props.resolvedData;
-
     if (typeof originResolveInput === 'function') {
       resolvedData = await originResolveInput(props);
     }
-
     const {
       item,
       context
-    } = props; // check if create/update item has the fields
-    // we want to monitor
+    } = props;
 
+    // check if create/update item has the fields
+    // we want to monitor
     for (let i = 0; i < manualOrderFields.length; i++) {
       var _resolvedData;
-
       const {
         targetFieldName,
         fieldName,
         targetListName,
         targetListLabelField
-      } = manualOrderFields[i]; // if create/update operation creates/modifies the `${targetFieldName}` field
+      } = manualOrderFields[i];
 
+      // if create/update operation creates/modifies the `${targetFieldName}` field
       if ((_resolvedData = resolvedData) !== null && _resolvedData !== void 0 && _resolvedData[targetFieldName]) {
-        var _resolvedData$targetF3, _resolvedData$targetF4;
-
-        let currentOrder = []; // update operation due to `item` not being `undefiend`
+        var _resolvedData$targetF2;
+        let currentOrder = [];
 
+        // update operation due to `item` not being `undefiend`
         if (item) {
-          var _resolvedData$targetF, _resolvedData$targetF2;
+          var _resolvedData$targetF;
+          const previousOrder = Array.isArray(item[fieldName]) ? item[fieldName] : [];
 
-          const previousOrder = Array.isArray(item[fieldName]) ? item[fieldName] : []; // user disconnects/removes some relationship items.
-
-          const disconnectIds = ((_resolvedData$targetF = resolvedData[targetFieldName]) === null || _resolvedData$targetF === void 0 ? void 0 : (_resolvedData$targetF2 = _resolvedData$targetF.disconnect) === null || _resolvedData$targetF2 === void 0 ? void 0 : _resolvedData$targetF2.map(obj => obj.id.toString())) || []; // filtered out to-be-disconnected relationship items
+          // user disconnects/removes some relationship items.
+          const disconnectIds = ((_resolvedData$targetF = resolvedData[targetFieldName]) === null || _resolvedData$targetF === void 0 || (_resolvedData$targetF = _resolvedData$targetF.disconnect) === null || _resolvedData$targetF === void 0 ? void 0 : _resolvedData$targetF.map(obj => obj.id.toString())) || [];
 
+          // filtered out to-be-disconnected relationship items
           currentOrder = previousOrder.filter(({
             id
           }) => {
             return disconnectIds.indexOf(id) === -1;
           });
-        } // user connects/adds some relationship item.
-
-
-        const connectedIds = ((_resolvedData$targetF3 = resolvedData[targetFieldName]) === null || _resolvedData$targetF3 === void 0 ? void 0 : (_resolvedData$targetF4 = _resolvedData$targetF3.connect) === null || _resolvedData$targetF4 === void 0 ? void 0 : _resolvedData$targetF4.map(obj => obj.id.toString())) || [];
+        }
 
+        // user connects/adds some relationship item.
+        const connectedIds = ((_resolvedData$targetF2 = resolvedData[targetFieldName]) === null || _resolvedData$targetF2 === void 0 || (_resolvedData$targetF2 = _resolvedData$targetF2.connect) === null || _resolvedData$targetF2 === void 0 ? void 0 : _resolvedData$targetF2.map(obj => obj.id.toString())) || [];
         if (connectedIds.length > 0) {
           // Query relationship items from the database.
           // Therefore, we can have other fields to record in the monitoring field
@@ -133,14 +127,14 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
                 in: connectedIds
               }
             }
-          }); // Database query results are not sorted.
-          // We need to sort them by ourselves.
+          });
 
+          // Database query results are not sorted.
+          // We need to sort them by ourselves.
           for (let i = 0; i < connectedIds.length; i++) {
             const sf = sfToConnect.find(obj => {
               return `${obj.id}` === connectedIds[i];
             });
-
             if (sf) {
               currentOrder.push({
                 id: sf.id.toString(),
@@ -148,18 +142,17 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
               });
             }
           }
-        } // records the order in the monitoring field
-
+        }
 
+        // records the order in the monitoring field
         resolvedData[fieldName] = currentOrder;
       }
     }
-
     return resolvedData;
   };
-
   return list;
 }
+
 /**
  *  This functiona adds the virtual field onto Keystone6 `list` object.
  *  For instance, if we want to use monitoring field `manualOrderOfAuthors`
@@ -181,29 +174,24 @@ function addManualOrderRelationshipFields(manualOrderFields = [], list) {
  *
  *  And the GQL resolver will be defined in `resolve` function.
  */
-
-
 function addVirtualFieldToReturnItemsInInputOrder(list, manualOrderField) {
   const virtualFieldName = `${manualOrderField.targetFieldName}InInputOrder`;
   list.fields[virtualFieldName] = (0, _fields.virtual)({
     field: lists => {
       var _lists$manualOrderFie;
-
       return _core.graphql.field({
-        type: _core.graphql.list(lists === null || lists === void 0 ? void 0 : (_lists$manualOrderFie = lists[manualOrderField.targetListName]) === null || _lists$manualOrderFie === void 0 ? void 0 : _lists$manualOrderFie.types.output),
-
+        type: _core.graphql.list(lists === null || lists === void 0 || (_lists$manualOrderFie = lists[manualOrderField.targetListName]) === null || _lists$manualOrderFie === void 0 ? void 0 : _lists$manualOrderFie.types.output),
         async resolve(item, args, context) {
           var _context$db;
-
           const manualOrderFieldValue = (item === null || item === void 0 ? void 0 : item[manualOrderField.fieldName]) || [];
-
           if (!Array.isArray(manualOrderFieldValue)) {
             return [];
-          } // collect ids from relationship items
-
+          }
 
-          const ids = manualOrderFieldValue.map(value => value.id); // query items from database
+          // collect ids from relationship items
+          const ids = manualOrderFieldValue.map(value => value.id);
 
+          // query items from database
           const unorderedItems = await ((_context$db = context.db) === null || _context$db === void 0 ? void 0 : _context$db[manualOrderField.targetListName].findMany({
             where: {
               id: {
@@ -211,18 +199,17 @@ function addVirtualFieldToReturnItemsInInputOrder(list, manualOrderField) {
               }
             }
           }));
-          const orderedItems = []; // sort items according to input order
+          const orderedItems = [];
 
+          // sort items according to input order
           manualOrderFieldValue.forEach(value => {
             const writer = unorderedItems.find(ui => `${ui === null || ui === void 0 ? void 0 : ui.id}` === `${value === null || value === void 0 ? void 0 : value.id}`);
-
             if (writer) {
               orderedItems.push(writer);
             }
           });
           return orderedItems;
         }
-
       });
     },
     ui: {
@@ -237,6 +224,5 @@ function addVirtualFieldToReturnItemsInInputOrder(list, manualOrderField) {
     }
   });
 }
-
 var _default = addManualOrderRelationshipFields;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kids-reporter/cms-core",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "",
   "main": "lib/index.js",
   "types": "src/index.ts",
@@ -33,7 +33,7 @@
     "@keystone-ui/fields": "^7.2.0",
     "@keystone-ui/modals": "^6.0.3",
     "@twreporter/errors": "^1.1.1",
-    "@kids-reporter/draft-editor": "0.3.0",
+    "@kids-reporter/draft-editor": "0.4.2",
     "axios": "^0.26.0",
     "draft-convert": "^2.1.12",
     "draft-js": "^0.11.7",

package/src/custom-fields/rich-text-editor/views/index.tsx

@@ -12,9 +12,8 @@ import {
 import { CellContainer, CellLink } from '@keystone-6/core/admin-ui/components'
 import { EditorState, convertFromRaw, convertToRaw } from 'draft-js'
 // import { RichTextEditor, decorators } from '@mirrormedia/lilith-draft-editor'
-import de from '@kids-reporter/draft-editor'
+import { RichTextEditor, decorator } from '@kids-reporter/draft-editor'
 
-const { RichTextEditor, decorators } = de.DraftEditor
 export const Field = ({
   field,
   value,
@@ -29,7 +28,7 @@ export const Field = ({
           <RichTextEditor
             disabledButtons={field.disabledButtons}
             editorState={value}
-            onChange={(editorState) => onChange?.(editorState)}
+            onChange={(editorState: EditorState) => onChange?.(editorState)}
           />
         </Stack>
       </FieldLabel>
@@ -60,26 +59,27 @@ export const controller = (
   config: FieldControllerConfig<{ disabledButtons: string[] }>
 ): FieldController<EditorState, JSONValue> & { disabledButtons: string[] } => {
   return {
+    description: '',
     disabledButtons: config.fieldMeta?.disabledButtons ?? [],
     path: config.path,
     label: config.label,
     graphqlSelection: config.path,
-    defaultValue: EditorState.createEmpty(decorators),
+    defaultValue: EditorState.createEmpty(decorator),
     deserialize: (data) => {
       const rawContentState = data[config.path]
       if (rawContentState === null) {
-        return EditorState.createEmpty(decorators)
+        return EditorState.createEmpty(decorator)
       }
       try {
         const contentState = convertFromRaw(rawContentState)
         const editorState = EditorState.createWithContent(
           contentState,
-          decorators
+          decorator
         )
         return editorState
       } catch (err) {
         console.error(err)
-        return EditorState.createEmpty(decorators)
+        return EditorState.createEmpty(decorator)
       }
     },
     serialize: (editorState: EditorState) => {

package/src/index.ts

@@ -1,7 +1,7 @@
 import addManualOrderRelationshipFields from './utils/manual-order-relationship'
 import { richTextEditor } from './custom-fields/rich-text-editor'
 
-export { buttonNames as richTextEditorButtonNames } from '@kids-reporter/draft-editor/lib/draft-editor'
+export { buttonNames as richTextEditorButtonNames } from '@kids-reporter/draft-editor'
 
 export const customFields = {
   richTextEditor,