fix: group fields and related issues (#103)

Author: birkir

packages/prime-core/__tests__/utils/createSchemaQuery.ts

@@ -63,7 +63,9 @@ export const createSchemaQuery = (name, fields) => {
     title: name,
     description: name,
     variant: enumValue('Default'),
-    settings: {},
+    settings: {
+      mutations: true,
+    },
     fields: [
       {
         title: 'Main',

packages/prime-core/src/modules/external/index.ts

@@ -69,10 +69,16 @@ export const createExternal = async (connection: Connection) => {
 
     if (schema.variant === SchemaVariant.Default) {
       queries[name] = SchemaTypeConfig;
-      queries[`all${name}`] = connectionType;
-      mutations[`create${name}`] = createType;
-      mutations[`update${name}`] = updateType;
-      mutations[`remove${name}`] = DocumentRemove;
+
+      if (!schema.settings.single) {
+        queries[`all${name}`] = connectionType;
+      }
+
+      if (schema.settings.mutations) {
+        mutations[`create${name}`] = createType;
+        mutations[`update${name}`] = updateType;
+        mutations[`remove${name}`] = DocumentRemove;
+      }
     }
 
     types.set(`create${name}`, createType);
@@ -101,10 +107,22 @@ export const createExternal = async (connection: Connection) => {
     resolvers[`remove${name}`] = await createDocumentRemoveResolver(payload);
 
     queries[name].resolve = resolvers[name];
-    queries[`all${name}`].resolve = resolvers[`all${name}`];
-    mutations[`create${name}`].resolve = resolvers[`create${name}`];
-    mutations[`update${name}`].resolve = resolvers[`update${name}`];
-    mutations[`remove${name}`].resolve = resolvers[`remove${name}`];
+
+    if (queries[`all${name}`]) {
+      queries[`all${name}`].resolve = resolvers[`all${name}`];
+    }
+
+    if (mutations[`create${name}`]) {
+      mutations[`create${name}`].resolve = resolvers[`create${name}`];
+    }
+
+    if (mutations[`update${name}`]) {
+      mutations[`update${name}`].resolve = resolvers[`update${name}`];
+    }
+
+    if (mutations[`remove${name}`]) {
+      mutations[`remove${name}`].resolve = resolvers[`remove${name}`];
+    }
 
     const SchemaType = types.get(schema.name)!.type!;
 

packages/prime-core/src/modules/external/resolvers/createDocumentResolver.ts

@@ -2,7 +2,7 @@ import { getRepository, IsNull, Raw } from 'typeorm';
 import { Document } from '../../../entities/Document';
 import { SchemaPayload } from '../interfaces/SchemaPayload';
 
-const getDefaultLocale = () => 'en';
+const getDefaultLocale = async () => 'en';
 
 export const createDocumentResolver = async ({
   name,
@@ -13,9 +13,10 @@ export const createDocumentResolver = async ({
   const documentRepository = getRepository(Document);
 
   return async (root, args: { id: string; locale?: string }, context, info) => {
-    const key = args.id.length === 36 ? 'id' : 'documentId';
+    const key = args.id && args.id.length === 36 ? 'id' : 'documentId';
     const locale = args.locale || (await getDefaultLocale());
     const single = schema.settings.single;
+
     const where = {
       ...(!single && { [key]: args.id }),
       ...((single || key === 'documentId') && {

packages/prime-field-group/src/PrimeFieldGroup.ts

@@ -98,4 +98,16 @@ export class PrimeFieldGroup extends PrimeField {
       fields,
     });
   }
+
+  public async processOutput(value) {
+    if (!Array.isArray(value) && this.options.repeated) {
+      return [value];
+    }
+
+    if (Array.isArray(value) && !this.options.repeated) {
+      return value[0];
+    }
+
+    return value;
+  }
 }

packages/prime-field-group/src/ui/InputComponent.tsx

@@ -18,7 +18,8 @@ const { uuid = { v4: randomUuid } } = window as any;
 const initialToken = uuid.v4();
 
 const getItems = ({ initialValue, field }: PrimeFieldProps) => {
-  if (!field.options.repeated) {
+  const options = { ...field.defaultOptions, ...field.options };
+  if (!options.repeated) {
     return [[initialToken, 0]];
   }
 
@@ -39,6 +40,11 @@ export class InputComponent extends React.PureComponent<PrimeFieldProps, any> {
     index: getIndex(this.props),
   };
 
+  get options() {
+    const { field } = this.props;
+    return { ...field.defaultOptions, ...field.options };
+  }
+
   public componentWillReceiveProps(nextProps: PrimeFieldProps) {
     if (!this.props.document && nextProps.document) {
       this.setState({
@@ -77,7 +83,7 @@ export class InputComponent extends React.PureComponent<PrimeFieldProps, any> {
   };
 
   public renderField = (field: any, key: string, index: number) => {
-    const repeated = get(this.props.field, 'options.repeated', false);
+    const repeated = this.options.repeated;
     const prefix = repeated ? `${index}.` : '';
     const path = `${this.props.path}.${prefix}${field.name}`;
     const initialValue = get(this.props.initialValue, `${prefix}${field.name}`);
@@ -93,7 +99,7 @@ export class InputComponent extends React.PureComponent<PrimeFieldProps, any> {
   public renderGroupItem = ([key, index]: any) => {
     const { field } = this.props;
     const { fields = [] } = field;
-    const repeated = get(field, 'options.repeated', false);
+    const repeated = this.options.repeated;
 
     if (!key) {
       return null;
@@ -119,7 +125,7 @@ export class InputComponent extends React.PureComponent<PrimeFieldProps, any> {
   public render() {
     const { items } = this.state;
     const { field } = this.props;
-    const repeated = get(field, 'options.repeated', false);
+    const repeated = this.options.repeated;
 
     if (field.fields.length === 0) {
       return null;

packages/prime-field/src/interfaces/SchemaField.ts

@@ -11,6 +11,7 @@ export interface SchemaField {
   position: number;
   primary: boolean;
   options: any;
+  defaultOptions?: any;
   fields: SchemaField[];
   parentFieldId?: string;
   parentField?: SchemaField | null;

packages/prime-ui/src/routes/schemas/components/EditContentType.tsx

@@ -173,7 +173,7 @@ const EditContentTypeBase = ({ form, onCancel, onSubmit, schemas, schemaId, item
             </Form.Item>
             <Form.Item label="Mutations">
               {getFieldDecorator('settings.mutations', {
-                initialValue: true,
+                initialValue: false,
                 valuePropName: 'checked',
               })(<Switch />)}
             </Form.Item>

packages/prime-ui/src/stores/models/Schema.ts

@@ -1,5 +1,6 @@
 import { destroy, detach, getParent, hasParentOfType, Instance, types } from 'mobx-state-tree';
 import { JSONObject } from '../../interfaces/JSONObject';
+import { Settings } from '../settings';
 
 export type ISchemaField = Instance<typeof SchemaField>;
 export interface IAddField {
@@ -35,6 +36,13 @@ export const SchemaField = types
     get isLeaf() {
       return !hasParentOfType(self, SchemaField);
     },
+    get defaultOptions() {
+      const settingsField = Settings.fields.find((f: any) => f.type === self.type);
+      if (settingsField) {
+        return settingsField.options;
+      }
+      return {};
+    },
   }))
   .actions(self => ({
     update(obj: {