parse Django model ordering; fix checkbox type

wq · Dec 21, 2020 · b909674 · b909674
1 parent 983a852
commit b909674
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 10 deletions.
diff --git a/packages/material/src/components/inputs/Checkbox.js b/packages/material/src/components/inputs/Checkbox.js
@@ -7,7 +7,12 @@ import PropTypes from 'prop-types';
 export default function Input({ label, ...props }) {
  return (
  <>
- <Field component={CheckboxWithLabel} Label={{ label }} {...props} />
+ <Field
+ component={CheckboxWithLabel}
+ Label={{ label }}
+ {...props}
+ type="checkbox"
+ />
  <HelperText name={props.name} hint={props.hint} />
  </>
  );

diff --git a/packages/model/src/model.js b/packages/model/src/model.js
@@ -409,8 +409,8 @@ class Model {
  return this.orm.session(this.store.getState().orm);
  }
 
- getSessionModel() {
- const model = this.getSession()[this.name];
+ getSessionModel(session) {
+ const model = (session || this.getSession())[this.name];
  if (!model) {
  throw new Error('Could not find model in session');
  }
@@ -421,11 +421,25 @@ class Model {
  return this.getSessionModel();
  }
 
- getQuerySet() {
- const model = this.getSessionModel();
- return model
- .all()
- .orderBy(this.idCol, this.opts.reversed ? 'desc' : 'asc');
+ getQuerySet(session) {
+ const model = this.getSessionModel(session),
+ ordering = this.config.ordering || [
+ this.opts.reversed ? `-${this.idCol}` : this.idCol
+ ],
+ columns = [],
+ orders = [];
+
+ ordering.map(name => {
+ let order = 'asc';
+ if (name.startsWith('-')) {
+ order = 'desc';
+ name = name.slice(1);
+ }
+ columns.push(name);
+ orders.push(order);
+ });
+
+ return model.all().orderBy(columns, orders);
  }
 
  get objects() {

diff --git a/packages/react/src/hooks.js b/packages/react/src/hooks.js
@@ -318,11 +318,18 @@ export function useModel(name, filter) {
  typeof filter === 'function' ||
  (typeof filter === 'object' && !Array.isArray(filter))
  ) {
+ // Filter by query
  selector = createSelector(model.orm, session =>
- session[name].filter(filter).toRefArray()
+ model.getQuerySet(session).filter(filter).toRefArray()
  );
- } else {
+ } else if (filter) {
+ // Filter by id (default ModelSelectorSpec behavior)
  selector = state => createSelector(model.orm[name])(state, filter);
+ } else {
+ // All objects (use getQuerySet() to leverage config.ordering)
+ selector = createSelector(model.orm, session =>
+ model.getQuerySet(session).toRefArray()
+ );
  }
 
  return useSelector(selector);