spacecruft
/
Farmbot-Web-App
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove branch from `handleUpdate()` until bug is resolved

pull/527/head
Rick Carlino 2017-10-30 14:42:25 -05:00
parent e8b91ce6b1
commit eb3b6c2b40
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
webpack/connectivity/temp_debug.ts
View File

@ -2,7 +2,7 @@ import { GetState } from "../redux/interfaces";
import { maybeDetermineUuid } from "../resources/selectors";
import { ResourceName, TaggedResource } from "../resources/tagged_resources";
import { destroyOK } from "../resources/actions";
import { init, overwrite } from "../api/crud";
import { overwrite } from "../api/crud";
import { fancyDebug } from "../util";
interface UpdateMqttData {
@ -61,25 +61,21 @@ function routeMqttData(chan: string, payload: Buffer): MqttDataResult {
}
}
const asTaggedResource =
(data: UpdateMqttData, uuid: string): TaggedResource => {
return {
// tslint:disable-next-line:no-any
kind: (data.kind as any),
uuid,
specialStatus: undefined,
// tslint:disable-next-line:no-any
body: (data.body as any) // I trust you, API...
};
const asTaggedResource = (data: UpdateMqttData, uuid: string): TaggedResource => {
return {
// tslint:disable-next-line:no-any
kind: (data.kind as any),
uuid,
specialStatus: undefined,
// tslint:disable-next-line:no-any
body: (data.body as any) // I trust you, API...
};
const handleCreate =
(data: UpdateMqttData) => init(asTaggedResource(data, "IS SET LATER"), true);
};
const handleUpdate =
(d: UpdateMqttData, uid: string) => {
const tr = asTaggedResource(d, uid);
overwrite(tr, tr.body);
return overwrite(tr, tr.body);
};
const handleErr = (d: BadMqttData) => console.log("DATA VALIDATION ERROR!", d);
@ -104,6 +100,11 @@ export const TempDebug =
case "UPDATE":
const { index } = getState().resources;
const uuid = maybeDetermineUuid(index, data.kind, data.id);
return dispatch(uuid ? handleUpdate(data, uuid) : handleCreate(data));
if (uuid) {
return dispatch(handleUpdate(data, uuid));
} else {
console.log("This branch is broke.");
}
}
};

6
webpack/resources/reducer.ts
View File

@ -159,6 +159,7 @@ export let resourceReducer = generateReducer
sanityCheck(tr);
dontTouchThis(tr);
reindexResource(s.index, tr);
console.log("HMMM: " + s.index.byKind.Tool.length);
return s;
} else {
throw new Error("BAD UUID IN UPDATE_RESOURCE_OK");
@ -198,6 +199,7 @@ export let resourceReducer = generateReducer
s.index.references[tr.uuid] = tr;
sanityCheck(tr);
dontTouchThis(tr);
console.log("HMMM: " + s.index.byKind.Tool.length);
return s;
})
.add<TaggedResource>(Actions.SAVE_RESOURCE_START, (s, { payload }) => {
@ -281,7 +283,9 @@ export function joinKindAndId(kind: ResourceName, id: number | undefined) {
return `${kind}.${id || 0}`;
}
const filterOutUuid = (tr: TaggedResource) => (uuid: string) => uuid !== tr.uuid;
const filterOutUuid =
(tr: TaggedResource) => (uuid: string) => uuid !== tr.uuid;
function removeFromIndex(index: ResourceIndex, tr: TaggedResource) {
const { kind } = tr;
const id = tr.body.id;