Merge pull request #142 from cotype/feature/setPosition

fix(server+client): Fix Set Position and Test Position

Author: mo-hh234

client/src/Edit/PositionModal.tsx

@@ -124,7 +124,8 @@ class PositionModal extends Component<Props, State> {
     if (this.props.model.order !== "asc") {
       [prev, post] = [post, prev];
     }
-    this.props.onSave(middleString(prev, post));
+
+    this.props.onSave(middleString(prev, prev !== post ? post : undefined));
   };
   render() {
     let { items } = this.state;

src/model/getPositionFields.ts

@@ -12,3 +12,20 @@ const getPositionFields = (model: Cotype.Model): string[] => {
 };
 
 export default getPositionFields;
+
+export const getPositionFieldsWithValue = (
+  data: any,
+  model: Cotype.Model
+): Array<{ fieldPath: string; value: string }> => {
+  const fields: Array<{ fieldPath: string; value: string }> = [];
+  visit(data, model, {
+    position(s: string, f, d, stringPath) {
+      if (stringPath)
+        fields.push({
+          value: s,
+          fieldPath: stringPath
+        });
+    }
+  });
+  return fields;
+};

src/model/setPosition.ts

@@ -13,15 +13,18 @@ export default function setPosition(
   model: Cotype.Model,
   lastPos: string = firstMudderCharacter,
   nextPos?: string,
-  forcePositionSet?: boolean
+  forcePositionSet?: boolean,
+  stringPath?: string
 ) {
   visit(obj, model, {
-    position(pos: string) {
-      if (!pos || forcePositionSet) {
-        return middleString(
-          lastPos,
-          nextPos === lastPos ? nextPos + "z" : nextPos
-        );
+    position(pos: string, f, d, path: string) {
+      if ((stringPath && stringPath === path) || !stringPath) {
+        if (!pos || forcePositionSet) {
+          return middleString(
+            lastPos,
+            nextPos === lastPos ? nextPos + "z" : nextPos
+          );
+        }
       }
     }
   });

src/persistence/adapter/knex/KnexContent.ts

@@ -13,12 +13,13 @@ import UniqueFieldError, {
 } from "../../errors/UniqueFieldError";
 import setPosition from "../../../model/setPosition";
 import getAlwaysUniqueFields from "../../../model/getAlwaysUniqueFields";
-import getPositionFields from "../../../model/getPositionFields";
+import { getPositionFieldsWithValue } from "../../../model/getPositionFields";
 import getInverseReferenceFields from "../../../model/getInverseReferenceFields";
 import log from "../../../log";
 import visitModel from "../../../model/visitModel";
 import { Migration } from "../../ContentPersistence";
 import { Model } from "../../../../typings";
+import visit from "../../../model/visit";
 
 const ops: any = {
   eq: "=",
@@ -199,47 +200,67 @@ export default class KnexContent implements ContentAdapter {
     data: any,
     id: string
   ): Promise<any> {
-    const positionFields = getPositionFields(model);
-    if (positionFields) {
+    const positionFields = getPositionFieldsWithValue(data, model);
+    if (positionFields.length > 0) {
       await Promise.all(
-        positionFields.map(async f => {
-          const criteria: any = {};
-
-          const value = (f.split(".").reduce((obj, key) => {
-            if (obj && obj[key] !== "undefined") {
-              return obj[key];
-            } else {
-              obj[key] = "";
-              return obj[key];
-            }
-          }, data) as unknown) as string;
-          if (value !== undefined) {
-            criteria[`data.${f}`] = { gte: value };
-          }
-
-          const opts = { offset: 0, limit: 3, orderBy: f, order: "asc" };
-          const items = await this.list(model, models, opts, criteria);
-          items.items = items.items.filter(item => item.id === id);
-          let nextPos;
+        positionFields.map(async ({ fieldPath, value }) => {
+          const criteria: any = value
+            ? {
+                [`data.${fieldPath}`]: { gte: value }
+              }
+            : {};
+          const opts = {
+            offset: 0,
+            limit: 3,
+            orderBy: fieldPath,
+            order: value ? "asc" : "desc"
+          };
+          const items = await this.list(model, models, opts, criteria, {
+            ignoreSchedule: true
+          });
           if (items.items[0]) {
-            nextPos = (f
-              .split(".")
-              .reduce(
-                (obj: any, key) =>
-                  obj && obj[key] !== "undefined" ? obj[key] : undefined,
-                items.items[0].data
-              ) as unknown) as string;
-            if (value === nextPos && items.items[1]) {
-              nextPos = (f
-                .split(".")
-                .reduce(
-                  (obj: any, key) =>
-                    obj && obj[key] !== "undefined" ? obj[key] : undefined,
-                  items.items[1].data
-                ) as unknown) as string;
-            }
+            visit(items.items[0].data, model, {
+              position(s: string, f, d, stringPath) {
+                if (stringPath === fieldPath) {
+                  if (!value) {
+                    // No Position Value passed, use end of list
+                    data = setPosition(data, model, s, "z", true, fieldPath);
+                  } else if (
+                    s === value &&
+                    String(items.items[0].id) !== String(id) // Value exists, and is not same document
+                  ) {
+                    if (items.items[1]) {
+                      // get next one and middle it
+                      visit(items.items[0].data, model, {
+                        position(nextPosition: string, g, h, nextStringPath) {
+                          if (nextStringPath === fieldPath) {
+                            data = setPosition(
+                              data,
+                              model,
+                              value,
+                              nextPosition,
+                              true,
+                              fieldPath
+                            );
+                          }
+                        }
+                      });
+                    } else {
+                      // No next one, just middle to end
+                      data = setPosition(
+                        data,
+                        model,
+                        value,
+                        "z",
+                        true,
+                        fieldPath
+                      );
+                    }
+                  }
+                }
+              }
+            });
           }
-          data = setPosition(data, model, value, nextPos, true);
         })
       );
     }