Page MenuHomePhabricator
Files F2765936

D13345.id44199.diff
No OneTemporary
Actions

D13345.id44199.diff
View Options

diff --git a/lib/actions/entry-actions.js b/lib/actions/entry-actions.js
--- a/lib/actions/entry-actions.js
+++ b/lib/actions/entry-actions.js
@@ -19,6 +19,7 @@
import {
type DMCreateEntryOperation,
type DMEditEntryOperation,
+ type DMDeleteEntryOperation,
} from '../types/dm-ops.js';
import type {
RawEntryInfo,
@@ -407,10 +408,81 @@
};
};
+export type UseDeleteEntryInput = $ReadOnly<
+ | {
+ +thick: false,
+ +deleteEntryInfo: DeleteEntryInfo,
+ }
+ | {
+ +thick: true,
+ +threadInfo: ThreadInfo,
+ +deleteEntryInfo: DeleteEntryInfo,
+ },
+>;
function useDeleteEntry(): (
- info: DeleteEntryInfo,
+ input: UseDeleteEntryInput,
) => Promise<DeleteEntryResult> {
- return useKeyserverCall(deleteEntry);
+ const viewerID = useSelector(
+ state => state.currentUserInfo && state.currentUserInfo.id,
+ );
+
+ const processAndSendDMOperation = useProcessAndSendDMOperation();
+ const keyserverCall = useKeyserverCall(deleteEntry);
+ const entryInfos = useSelector(state => state.entryStore.entryInfos);
+
+ return React.useCallback(
+ async (input: UseDeleteEntryInput) => {
+ if (!input.thick) {
+ const result = await keyserverCall(input.deleteEntryInfo);
+ return result;
+ }
+ const { deleteEntryInfo, threadInfo } = input;
+ const prevEntry = entryInfos[deleteEntryInfo.entryID];
+
+ invariant(viewerID, 'viewerID must be set');
+
+ const op: DMDeleteEntryOperation = {
+ type: 'delete_entry',
+ threadID: threadInfo.id,
+ creatorID: viewerID,
+ creationTime: prevEntry.creationTime,
+ lastUpdatedTime: Date.now(),
+ entryID: deleteEntryInfo.entryID,
+ entryDate: stringFromDate(
+ prevEntry.year,
+ prevEntry.month,
+ prevEntry.day,
+ ),
+ prevText: deleteEntryInfo.prevText,
+ messageID: uuid.v4(),
+ };
+
+ const opSpecification: OutboundDMOperationSpecification = {
+ type: dmOperationSpecificationTypes.OUTBOUND,
+ op,
+ recipients: {
+ type: 'all_thread_members',
+ threadID:
+ threadInfo.type === thickThreadTypes.THICK_SIDEBAR &&
+ threadInfo.parentThreadID
+ ? threadInfo.parentThreadID
+ : threadInfo.id,
+ },
+ };
+
+ void processAndSendDMOperation(opSpecification);
+
+ return {
+ threadID: threadInfo.id,
+ newMessageInfos: [],
+ updatesResult: {
+ viewerUpdates: [],
+ userInfos: [],
+ },
+ };
+ },
+ [keyserverCall, processAndSendDMOperation, viewerID, entryInfos],
+ );
}
export type FetchRevisionsForEntryInput = {
diff --git a/lib/shared/dm-ops/delete-entry-spec.js b/lib/shared/dm-ops/delete-entry-spec.js
--- a/lib/shared/dm-ops/delete-entry-spec.js
+++ b/lib/shared/dm-ops/delete-entry-spec.js
@@ -15,15 +15,16 @@
import { rawMessageInfoFromMessageData } from '../message-utils.js';
function createMessageDataFromDMOperation(dmOperation: DMDeleteEntryOperation) {
- const { threadID, creatorID, time, entryID, entryDate, text } = dmOperation;
+ const { threadID, creatorID, lastUpdatedTime, entryID, entryDate, prevText } =
+ dmOperation;
return {
type: messageTypes.DELETE_ENTRY,
threadID,
creatorID,
- time,
+ time: lastUpdatedTime,
entryID,
date: entryDate,
- text,
+ text: prevText,
};
}
@@ -36,10 +37,11 @@
const {
threadID,
creatorID,
- time,
+ lastUpdatedTime,
+ creationTime,
entryID,
entryDate: dateString,
- text,
+ prevText,
messageID,
} = dmOperation;
@@ -52,22 +54,22 @@
const rawEntryInfo: ThickRawEntryInfo = {
id: entryID,
threadID,
- text,
+ text: prevText,
year: date.getFullYear(),
month: date.getMonth() + 1,
day: date.getDate(),
- creationTime: time,
+ creationTime,
creatorID,
thick: true,
deleted: true,
- lastUpdatedTime: time,
+ lastUpdatedTime,
};
const entryUpdateInfo: EntryUpdateInfo = {
entryInfo: rawEntryInfo,
type: updateTypes.UPDATE_ENTRY,
id: uuid.v4(),
- time,
+ time: lastUpdatedTime,
};
return {
diff --git a/lib/types/dm-ops.js b/lib/types/dm-ops.js
--- a/lib/types/dm-ops.js
+++ b/lib/types/dm-ops.js
@@ -401,10 +401,11 @@
+type: 'delete_entry',
+threadID: string,
+creatorID: string,
- +time: number,
+ +lastUpdatedTime: number,
+ +creationTime: number,
+entryID: string,
+entryDate: string,
- +text: string,
+ +prevText: string,
+messageID: string,
};
@@ -413,10 +414,11 @@
type: tString(dmOperationTypes.DELETE_ENTRY),
threadID: t.String,
creatorID: t.String,
- time: t.Number,
+ lastUpdatedTime: t.Number,
+ creationTime: t.Number,
entryID: t.String,
entryDate: t.String,
- text: t.String,
+ prevText: t.String,
messageID: t.String,
});
diff --git a/native/calendar/entry.react.js b/native/calendar/entry.react.js
--- a/native/calendar/entry.react.js
+++ b/native/calendar/entry.react.js
@@ -27,6 +27,7 @@
useSaveEntry,
type UseCreateEntryInput,
type UseSaveEntryInput,
+ type UseDeleteEntryInput,
} from 'lib/actions/entry-actions.js';
import { extractKeyserverIDFromIDOptional } from 'lib/keyserver-conn/keyserver-call-utils.js';
import { registerFetchKey } from 'lib/reducers/loading-reducer.js';
@@ -37,7 +38,6 @@
import type {
CalendarQuery,
CreateEntryPayload,
- DeleteEntryInfo,
DeleteEntryResult,
SaveEntryPayload,
SaveEntryResult,
@@ -209,7 +209,7 @@
// async functions that hit server APIs
+createEntry: (input: UseCreateEntryInput) => Promise<CreateEntryPayload>,
+saveEntry: (input: UseSaveEntryInput) => Promise<SaveEntryResult>,
- +deleteEntry: (info: DeleteEntryInfo) => Promise<DeleteEntryResult>,
+ +deleteEntry: (input: UseDeleteEntryInput) => Promise<DeleteEntryResult>,
+canEditEntry: boolean,
};
type State = {
@@ -786,15 +786,28 @@
}
async deleteAction(
- serverID: ?string,
+ entryID: ?string,
prevText: string,
): Promise<?DeleteEntryResult> {
- if (serverID) {
- return await this.props.deleteEntry({
- entryID: serverID,
+ if (entryID) {
+ const deleteEntryInfo = {
+ entryID,
prevText,
calendarQuery: this.props.calendarQuery(),
- });
+ };
+
+ const useDeleteEntryInput = threadTypeIsThick(this.props.threadInfo.type)
+ ? {
+ thick: true,
+ threadInfo: this.props.threadInfo,
+ deleteEntryInfo,
+ }
+ : {
+ thick: false,
+ deleteEntryInfo,
+ };
+
+ return await this.props.deleteEntry(useDeleteEntryInput);
} else if (this.creating || this.currentlySaving) {
this.needsDeleteAfterSave = true;
}
diff --git a/web/calendar/entry.react.js b/web/calendar/entry.react.js
--- a/web/calendar/entry.react.js
+++ b/web/calendar/entry.react.js
@@ -14,6 +14,7 @@
concurrentModificationResetActionType,
type UseCreateEntryInput,
type UseSaveEntryInput,
+ type UseDeleteEntryInput,
} from 'lib/actions/entry-actions.js';
import {
type PushModal,
@@ -30,7 +31,6 @@
type SaveEntryResult,
type SaveEntryPayload,
type CreateEntryPayload,
- type DeleteEntryInfo,
type DeleteEntryResult,
type CalendarQuery,
} from 'lib/types/entry-types.js';
@@ -74,7 +74,7 @@
+dispatchActionPromise: DispatchActionPromise,
+createEntry: (input: UseCreateEntryInput) => Promise<CreateEntryPayload>,
+saveEntry: (input: UseSaveEntryInput) => Promise<SaveEntryResult>,
- +deleteEntry: (info: DeleteEntryInfo) => Promise<DeleteEntryResult>,
+ +deleteEntry: (input: UseDeleteEntryInput) => Promise<DeleteEntryResult>,
+pushModal: PushModal,
+popModal: () => void,
};
@@ -444,7 +444,7 @@
}
async deleteAction(
- serverID: ?string,
+ entryID: ?string,
focusOnNextEntry: boolean,
): Promise<?DeleteEntryResult> {
invariant(
@@ -454,12 +454,25 @@
if (focusOnNextEntry) {
this.props.focusOnFirstEntryNewerThan(this.props.entryInfo.creationTime);
}
- if (serverID) {
- return await this.props.deleteEntry({
- entryID: serverID,
+ if (entryID) {
+ const deleteEntryInfo = {
+ entryID,
prevText: this.props.entryInfo.text,
calendarQuery: this.props.calendarQuery(),
- });
+ };
+
+ const useDeleteEntryInput = threadTypeIsThick(this.props.threadInfo.type)
+ ? {
+ thick: true,
+ threadInfo: this.props.threadInfo,
+ deleteEntryInfo,
+ }
+ : {
+ thick: false,
+ deleteEntryInfo,
+ };
+
+ return await this.props.deleteEntry(useDeleteEntryInput);
} else if (this.creating) {
this.needsDeleteAfterCreation = true;
}

File Metadata

Mime Type
text/plain
Expires
Fri, Sep 20, 3:04 PM (19 h, 9 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2150766
Default Alt Text
D13345.id44199.diff (8 KB)

Event Timeline