diff options
| author | bobzel <zzzman@gmail.com> | 2020-10-06 13:14:32 -0400 |
|---|---|---|
| committer | bobzel <zzzman@gmail.com> | 2020-10-06 13:14:32 -0400 |
| commit | 82355dad8304a3264349734a94db13aa94bb277c (patch) | |
| tree | 608e9a4011486d8c6e44873ea4ba3aa3502d6f6a | |
| parent | 68916ee8daafb03ad2aff3338e18ca419ce888de (diff) | |
cleanup fixes.
| -rw-r--r-- | src/client/views/DocComponent.tsx | 2 | ||||
| -rw-r--r-- | src/server/websocket.ts | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/views/DocComponent.tsx b/src/client/views/DocComponent.tsx index d6f8c49df..98e888538 100644 --- a/src/client/views/DocComponent.tsx +++ b/src/client/views/DocComponent.tsx @@ -123,7 +123,7 @@ export function ViewBoxAnnotatableComponent<P extends ViewBoxAnnotatableProps, T @action.bound removeDocument(doc: Doc | Doc[]): boolean { const effectiveAcl = GetEffectiveAcl(this.dataDoc); - const indocs = doc instanceof Doc ? [doc] : doc as Doc[]; + const indocs = doc instanceof Doc ? [doc] : doc; const docs = indocs.filter(doc => effectiveAcl === AclEdit || effectiveAcl === AclAdmin || GetEffectiveAcl(doc) === AclAdmin); if (docs.length) { const docs = doc instanceof Doc ? [doc] : doc; diff --git a/src/server/websocket.ts b/src/server/websocket.ts index 644eedf62..3687ef876 100644 --- a/src/server/websocket.ts +++ b/src/server/websocket.ts @@ -275,9 +275,9 @@ export namespace WebSocket { diff.diff.$set = diff.diff.$addToSet; // convert add to set to a query of the current fields, and then a set of the composition of the new fields with the old ones delete diff.diff.$addToSet; const updatefield = Array.from(Object.keys(diff.diff.$set))[0]; - const list = (results as any).fields?.[updatefield.replace("fields.", "")].fields; + const list = (results as any).fields?.[updatefield.replace("fields.", "")]?.fields; const prelen = diff.diff.$set[updatefield].fields.length; - list.forEach((item: any) => !diff.diff.$set[updatefield].fields.some((x: any) => x.fieldId === item.fieldId) && diff.diff.$set[updatefield].fields.push(item)); + list?.forEach((item: any) => !diff.diff.$set[updatefield].fields.some((x: any) => x.fieldId === item.fieldId) && diff.diff.$set[updatefield].fields.push(item)); const sendBack = diff.diff.$set[updatefield].fields.length !== prelen; Database.Instance.update(diff.id, diff.diff, () => { |