@journeyapps-labs/reactor-mod-data-browser 3.4.0 → 3.5.0

package/src/panels/query/QueryPanelWidget.tsx

@@ -8,6 +8,7 @@ import { Page } from '../../core/query/Page';
 import { PageResultsWidget } from './PageResultsWidget';
 import { TableControlsWidget } from './TableControlsWidget';
 import { autorun } from 'mobx';
+import { TableControlsPositionPreference, TableControlsPositionValue } from '../../preferences/QueryControlPreferences';
 
 export interface QueryPanelWidgetProps {
   model: QueryPanelModel;
@@ -93,6 +94,21 @@ export const QueryPanelWidget: React.FC<QueryPanelWidgetProps> = observer((props
 
   const activePage =
     props.model.current_page_data || (props.model.query ? props.model.query.getPage(props.model.current_page) : null);
+  const controlsPosition = TableControlsPositionPreference.getValue();
+
+  const controls = (
+    <TableControlsWidget
+      query={props.model.query}
+      current_page={activePage}
+      loading={loading}
+      onLoadSavedQuery={async (id) => {
+        await props.model.loadSavedQuery(id);
+      }}
+      goToPage={(index) => {
+        props.model.current_page = index;
+      }}
+    />
+  );
 
   return (
     <LoadingPanelWidget loading={!props.model.query || !activePage}>
@@ -101,30 +117,16 @@ export const QueryPanelWidget: React.FC<QueryPanelWidgetProps> = observer((props
           <S.Container>
             <BorderLayoutWidget
               top={
-                <TableControlsWidget
-                  query={props.model.query}
-                  current_page={activePage}
-                  loading={loading}
-                  onLoadSavedQuery={async (id) => {
-                    await props.model.loadSavedQuery(id);
-                  }}
-                  goToPage={(index) => {
-                    props.model.current_page = index;
-                  }}
-                />
+                controlsPosition === TableControlsPositionValue.TOP ||
+                controlsPosition === TableControlsPositionValue.BOTH
+                  ? controls
+                  : null
               }
               bottom={
-                <TableControlsWidget
-                  query={props.model.query}
-                  current_page={activePage}
-                  loading={loading}
-                  onLoadSavedQuery={async (id) => {
-                    await props.model.loadSavedQuery(id);
-                  }}
-                  goToPage={(index) => {
-                    props.model.current_page = index;
-                  }}
-                />
+                controlsPosition === TableControlsPositionValue.BOTTOM ||
+                controlsPosition === TableControlsPositionValue.BOTH
+                  ? controls
+                  : null
               }
             >
               <PageResultsWidget

package/src/preferences/QueryControlPreferences.ts

@@ -1,9 +1,49 @@
-import { BooleanSetting, PrefsStore } from '@journeyapps-labs/reactor-mod';
+import { BooleanSetting, PrefsStore, SetSetting, ioc } from '@journeyapps-labs/reactor-mod';
 
 export enum QueryControlPreferences {
   SHOW_SORT_CONTROLS = 'databrowser/query-controls/show-sort-controls',
   SHOW_FILTER_CONTROLS = 'databrowser/query-controls/show-filter-controls',
-  FILTER_NULL_FIELDS_IN_RELATIONSHIP_PEEK = 'databrowser/query-controls/filter-null-fields-in-relationship-peek'
+  FILTER_NULL_FIELDS_IN_RELATIONSHIP_PEEK = 'databrowser/query-controls/filter-null-fields-in-relationship-peek',
+  SHOW_ID_VALUE_IN_ID_COLUMN = 'databrowser/query-controls/show-id-value-in-id-column',
+  TABLE_CONTROLS_POSITION = 'databrowser/query-controls/table-controls-position'
+}
+
+export enum TableControlsPositionValue {
+  TOP = 'top',
+  BOTTOM = 'bottom',
+  BOTH = 'both'
+}
+
+export class TableControlsPositionPreference extends SetSetting {
+  static KEY = QueryControlPreferences.TABLE_CONTROLS_POSITION;
+
+  constructor() {
+    super({
+      key: TableControlsPositionPreference.KEY,
+      name: 'Table controls position',
+      category: 'Query Controls',
+      value: TableControlsPositionValue.BOTH,
+      options: [
+        {
+          key: TableControlsPositionValue.TOP,
+          label: 'Top'
+        },
+        {
+          key: TableControlsPositionValue.BOTTOM,
+          label: 'Bottom'
+        },
+        {
+          key: TableControlsPositionValue.BOTH,
+          label: 'Both'
+        }
+      ]
+    });
+  }
+
+  static getValue(): TableControlsPositionValue {
+    return ioc.get(PrefsStore).getPreference<TableControlsPositionPreference>(TableControlsPositionPreference.KEY)
+      .value as TableControlsPositionValue;
+  }
 }
 
 export const registerQueryControlPreferences = (prefsStore: PrefsStore) => {
@@ -31,4 +71,13 @@ export const registerQueryControlPreferences = (prefsStore: PrefsStore) => {
       category: 'Query Controls'
     })
   );
+  prefsStore.registerPreference(
+    new BooleanSetting({
+      key: QueryControlPreferences.SHOW_ID_VALUE_IN_ID_COLUMN,
+      checked: true,
+      name: 'Show ID value in ID column',
+      category: 'Query Controls'
+    })
+  );
+  prefsStore.registerPreference(new TableControlsPositionPreference());
 };

package/src/preferences/SchemaOrderingPreferences.ts

@@ -0,0 +1,82 @@
+import { ioc, PrefsStore, SetSetting } from '@journeyapps-labs/reactor-mod';
+
+export enum SchemaModelOrderValue {
+  ALPHABETICAL = 'alphabetical',
+  AS_DEFINED_IN_SCHEMA = 'as_defined_in_schema'
+}
+
+export class SchemaModelOrderingPreference extends SetSetting {
+  static KEY = 'databrowser/schema/model-order';
+
+  constructor() {
+    super({
+      key: SchemaModelOrderingPreference.KEY,
+      name: 'Schema model order',
+      category: 'Schema',
+      value: SchemaModelOrderValue.AS_DEFINED_IN_SCHEMA,
+      options: [
+        {
+          key: SchemaModelOrderValue.AS_DEFINED_IN_SCHEMA,
+          label: 'As defined in schema'
+        },
+        {
+          key: SchemaModelOrderValue.ALPHABETICAL,
+          label: 'Alphabetical'
+        }
+      ]
+    });
+  }
+
+  static getValue(): SchemaModelOrderValue {
+    return ioc.get(PrefsStore).getPreference<SchemaModelOrderingPreference>(SchemaModelOrderingPreference.KEY)
+      .value as SchemaModelOrderValue;
+  }
+}
+
+export enum SchemaFieldOrderValue {
+  ALPHABETICAL = 'alphabetical',
+  BELONGS_TO_FIRST = 'belongs_to_first',
+  BELONGS_TO_LAST = 'belongs_to_last',
+  AS_DEFINED_IN_SCHEMA = 'as_defined_in_schema'
+}
+
+export class SchemaFieldOrderingPreference extends SetSetting {
+  static KEY = 'databrowser/schema/field-order';
+
+  constructor() {
+    super({
+      key: SchemaFieldOrderingPreference.KEY,
+      name: 'Schema field order',
+      category: 'Schema',
+      value: SchemaFieldOrderValue.AS_DEFINED_IN_SCHEMA,
+      options: [
+        {
+          key: SchemaFieldOrderValue.AS_DEFINED_IN_SCHEMA,
+          label: 'As defined in schema'
+        },
+        {
+          key: SchemaFieldOrderValue.ALPHABETICAL,
+          label: 'Alphabetical'
+        },
+        {
+          key: SchemaFieldOrderValue.BELONGS_TO_FIRST,
+          label: 'Belongs-to first'
+        },
+        {
+          key: SchemaFieldOrderValue.BELONGS_TO_LAST,
+          label: 'Belongs-to last'
+        }
+      ]
+    });
+  }
+
+  static getValue(): SchemaFieldOrderValue {
+    return ioc.get(PrefsStore).getPreference<SchemaFieldOrderingPreference>(SchemaFieldOrderingPreference.KEY)
+      .value as SchemaFieldOrderValue;
+  }
+}
+
+export const registerSchemaOrderingPreferences = (prefsStore: PrefsStore) => {
+  prefsStore.registerPreference(new SchemaModelOrderingPreference());
+  prefsStore.registerPreference(new SchemaFieldOrderingPreference());
+};