fix: various things

Author: birkir

packages/prime-core/src/modules/internal/resolvers/DocumentResolver.ts

@@ -262,10 +262,14 @@ export class DocumentResolver {
     nullable: true,
   })
   public async primary(@Root() document: Document): Promise<any> {
-    const qb = this.schemaFieldRepository.createQueryBuilder().where('primary = TRUE');
+    const qb = this.schemaFieldRepository.createQueryBuilder();
     qb.cache(1000);
     let field = await this.schemaFieldRepository
-      .getLoader(qb, (b, keys) => b.where({ schemaId: In(keys) }), 'schemaId')
+      .getLoader(
+        qb,
+        (b, keys) => b.where({ schemaId: In(keys) }).andWhere('SchemaField.primary = TRUE'),
+        'schemaId'
+      )
       .load(document.schemaId);
 
     if (field) {

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

@@ -7,7 +7,7 @@ type ISlice = null | {
   __inputtype: string;
   id: string;
   title: string;
-  schema: any;
+  fields: any;
 };
 
 interface IState {
@@ -54,7 +54,7 @@ export class InputComponent extends React.Component<PrimeFieldProps, IState> {
 
   public async load() {
     const { field, stores } = this.props;
-    const ids = get(field.options, 'contentTypeIds', []);
+    const ids = get(field.options, 'schemaIds', []);
     const initialValue = (this.props.initialValue as any) || [];
 
     this.setState({
@@ -135,6 +135,8 @@ export class InputComponent extends React.Component<PrimeFieldProps, IState> {
           }
           const { index } = slice as any;
 
+          console.log(slice);
+
           return (
             <Card key={`${slice.id}_${index}`} className="prime-slice-item">
               <div className="prime-slice-item-actions">
@@ -165,7 +167,7 @@ export class InputComponent extends React.Component<PrimeFieldProps, IState> {
               {form.getFieldDecorator(`${path}.${index}.__inputname`, {
                 initialValue: slice.id,
               })(<input type="hidden" />)}
-              {slice.schema.fields.filter(noChildren).map((f: any) => this.renderField(f, index))}
+              {slice.fields.fields.filter(noChildren).map((f: any) => this.renderField(f, index))}
             </Card>
           );
         })}

packages/prime-field-slice/src/ui/SchemaSettingsComponent.tsx

@@ -16,10 +16,10 @@ export class SchemaSettingsComponent extends React.PureComponent<PrimeFieldProps
     return (
       <>
         <Form.Item label="Slices" style={{ marginBottom: 8 }}>
-          {form.getFieldDecorator('options.contentTypeIds')(
+          {form.getFieldDecorator('options.schemaIds')(
             <Select placeholder="Select Slices" mode="multiple">
               {stores.ContentTypes.list
-                .filter((n: IContentType) => n.variant === SchemaVariant.Slice)
+                .filter((n: any) => n.variant === 'Slice')
                 .map((contentType: IContentType) => (
                   <Select.Option value={contentType.id} key={contentType.id}>
                     {contentType.title}

packages/prime-ui/src/routes/schemas/components/field-row/FieldRow.tsx

@@ -87,7 +87,7 @@ export class FieldRow extends React.Component<IProps> {
                         disabled={starDisabled}
                         onClick={this.onDisplayClick}
                       >
-                        <Icon type="star" theme={field.isDisplay ? 'filled' : 'outlined'} />
+                        <Icon type="star" theme={field.primary ? 'filled' : 'outlined'} />
                       </Button>
                     </Tooltip>
                   )}

packages/prime-ui/src/stores/auth.ts

@@ -57,7 +57,6 @@ export const Auth = types
       if (data && data.getUser) {
         self.isLoggedIn = true;
         self.user = data.getUser;
-        console.log(self.user);
         yield ensureFields();
       }
       if (!self.isLoggedIn) {