Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2841726
D13108.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D13108.diff
View Options
diff --git a/keyserver/src/responders/redux-state-responders.js b/keyserver/src/responders/redux-state-responders.js
--- a/keyserver/src/responders/redux-state-responders.js
+++ b/keyserver/src/responders/redux-state-responders.js
@@ -14,7 +14,6 @@
parsePendingThreadID,
createPendingThread,
} from 'lib/shared/thread-utils.js';
-import { canUseDatabaseOnWeb } from 'lib/shared/web-database.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import {
type CommunityLinks,
@@ -73,7 +72,6 @@
request: InitialReduxStateRequest,
): Promise<ServerWebInitialReduxStateResponse> {
const { urlInfo, excludedData, clientUpdatesCurrentAsOf } = request;
- const useDatabase = viewer.loggedIn && canUseDatabaseOnWeb(viewer.userID);
const hasNotAcknowledgedPoliciesPromise = hasAnyNotAcknowledgedPolicies(
viewer.id,
@@ -117,10 +115,9 @@
};
})();
const messageSelectionCriteria = { joinedThreads: true };
- const serverUpdatesCurrentAsOf =
- useDatabase && clientUpdatesCurrentAsOf
- ? clientUpdatesCurrentAsOf
- : Date.now();
+ const serverUpdatesCurrentAsOf = clientUpdatesCurrentAsOf
+ ? clientUpdatesCurrentAsOf
+ : Date.now();
const threadInfoPromise = fetchThreadInfos(viewer);
const messageInfoPromise = fetchMessageInfos(
@@ -144,7 +141,7 @@
})();
const threadStorePromise = (async () => {
- if (excludedData.threadStore && useDatabase) {
+ if (excludedData.threadStore) {
return { threadInfos: {} };
}
const [{ threadInfos }, hasNotAcknowledgedPolicies] = await Promise.all([
@@ -187,7 +184,7 @@
return freshStore;
})();
const finalMessageStorePromise: Promise<MessageStore> = (async () => {
- if (excludedData.messageStore && useDatabase) {
+ if (excludedData.messageStore) {
return {
messages: {},
threads: {},
@@ -216,7 +213,7 @@
};
})();
const finalEntryStorePromise = (async () => {
- if (excludedData.entryStore && useDatabase) {
+ if (excludedData.entryStore) {
return {
entryInfos: {},
daysToEntries: {},
@@ -233,7 +230,7 @@
return hasNotAcknowledgedPolicies ? {} : userInfos;
})();
const finalUserInfosPromise = (async () => {
- if (excludedData.userStore && useDatabase) {
+ if (excludedData.userStore) {
return {};
}
return await userInfosPromise;
diff --git a/lib/shared/web-database.js b/lib/shared/web-database.js
deleted file mode 100644
--- a/lib/shared/web-database.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// @flow
-
-import { isStaff } from './staff-utils.js';
-import { isDev } from '../utils/dev-utils.js';
-
-function canUseDatabaseOnWeb(userID: ?string): boolean {
- if (!userID) {
- return false;
- }
- return isDev || isStaff(userID);
-}
-
-export { canUseDatabaseOnWeb };
diff --git a/web/components/db-ops-handler.react.js b/web/components/db-ops-handler.react.js
--- a/web/components/db-ops-handler.react.js
+++ b/web/components/db-ops-handler.react.js
@@ -5,14 +5,12 @@
import { DBOpsHandler as BaseHandler } from 'lib/handlers/db-ops-handler.react.js';
import type { StoreOperations } from 'lib/types/store-ops-types.js';
-import { useSelector } from '../redux/redux-utils.js';
import { processDBStoreOperations } from '../shared-worker/utils/store.js';
function DBOpsHandler(): React.Node {
- const currentUserID = useSelector(state => state.currentUserInfo?.id ?? null);
const processOperations = React.useCallback(
- (ops: StoreOperations) => processDBStoreOperations(ops, currentUserID),
- [currentUserID],
+ (ops: StoreOperations) => processDBStoreOperations(ops),
+ [],
);
return <BaseHandler processDBStoreOperations={processOperations} />;
}
diff --git a/web/redux/initial-state-gate.js b/web/redux/initial-state-gate.js
--- a/web/redux/initial-state-gate.js
+++ b/web/redux/initial-state-gate.js
@@ -11,7 +11,6 @@
import type { UserStoreOperation } from 'lib/ops/user-store-ops.js';
import { getMessageSearchStoreOps } from 'lib/reducers/db-ops-reducer.js';
import { allUpdatesCurrentAsOfSelector } from 'lib/selectors/keyserver-selectors.js';
-import { canUseDatabaseOnWeb } from 'lib/shared/web-database.js';
import type { RawThreadInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import { convertIDToNewSchema } from 'lib/utils/migration-utils.js';
import { entries, values } from 'lib/utils/objects.js';
@@ -89,9 +88,8 @@
const currentLoggedInUserID = payload.currentUserInfo?.anonymous
? null
: payload.currentUserInfo?.id;
- const useDatabase = canUseDatabaseOnWeb(currentLoggedInUserID);
- if (!currentLoggedInUserID || !useDatabase) {
+ if (!currentLoggedInUserID) {
dispatch({ type: setInitialReduxState, payload });
return;
}
@@ -168,24 +166,21 @@
const messageSearchStoreOperations = getMessageSearchStoreOps(
messageStoreOperations,
);
- await processDBStoreOperations(
- {
- threadStoreOperations,
- draftStoreOperations: [],
- messageStoreOperations,
- reportStoreOperations: [],
- userStoreOperations,
- keyserverStoreOperations: [],
- communityStoreOperations: [],
- integrityStoreOperations: [],
- syncedMetadataStoreOperations: [],
- auxUserStoreOperations: [],
- threadActivityStoreOperations: [],
- entryStoreOperations,
- messageSearchStoreOperations,
- },
- currentLoggedInUserID,
- );
+ await processDBStoreOperations({
+ threadStoreOperations,
+ draftStoreOperations: [],
+ messageStoreOperations,
+ reportStoreOperations: [],
+ userStoreOperations,
+ keyserverStoreOperations: [],
+ communityStoreOperations: [],
+ integrityStoreOperations: [],
+ syncedMetadataStoreOperations: [],
+ auxUserStoreOperations: [],
+ threadActivityStoreOperations: [],
+ entryStoreOperations,
+ messageSearchStoreOperations,
+ });
}
dispatch({
diff --git a/web/shared-worker/utils/store.js b/web/shared-worker/utils/store.js
--- a/web/shared-worker/utils/store.js
+++ b/web/shared-worker/utils/store.js
@@ -11,7 +11,6 @@
import { threadActivityStoreOpsHandlers } from 'lib/ops/thread-activity-store-ops.js';
import { threadStoreOpsHandlers } from 'lib/ops/thread-store-ops.js';
import { userStoreOpsHandlers } from 'lib/ops/user-store-ops.js';
-import { canUseDatabaseOnWeb } from 'lib/shared/web-database.js';
import type {
ClientStore,
StoreOperations,
@@ -163,7 +162,6 @@
async function processDBStoreOperations(
storeOperations: StoreOperations,
- userID?: ?string,
): Promise<void> {
const {
draftStoreOperations,
@@ -182,11 +180,8 @@
messageSearchStoreOperations,
} = storeOperations;
- const canUseDatabase = canUseDatabaseOnWeb(userID);
-
- const convertedThreadStoreOperations = canUseDatabase
- ? threadStoreOpsHandlers.convertOpsToClientDBOps(threadStoreOperations)
- : [];
+ const convertedThreadStoreOperations =
+ threadStoreOpsHandlers.convertOpsToClientDBOps(threadStoreOperations);
const convertedReportStoreOperations =
reportStoreOpsHandlers.convertOpsToClientDBOps(reportStoreOperations);
const convertedKeyserverStoreOperations =
@@ -257,19 +252,16 @@
});
} catch (e) {
console.log(e);
- if (canUseDatabase) {
- window.alert(e.message);
- if (
- entries(storeOperations).some(
- ([key, ops]) =>
- key !== 'draftStoreOperations' &&
- key !== 'reportStoreOperations' &&
- ops.length > 0,
- )
- ) {
- await sharedWorker.init({ clearDatabase: true, markAsCorrupted: true });
- location.reload();
- }
+ if (
+ entries(storeOperations).some(
+ ([key, ops]) =>
+ key !== 'draftStoreOperations' &&
+ key !== 'reportStoreOperations' &&
+ ops.length > 0,
+ )
+ ) {
+ await sharedWorker.init({ clearDatabase: true, markAsCorrupted: true });
+ location.reload();
}
}
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Mon, Sep 30, 11:11 AM (21 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2204847
Default Alt Text
D13108.diff (8 KB)
Attached To
Mode
D13108: [SQLite] enable DB on web for all users
Attached
Detach File
Event Timeline
Log In to Comment