Page MenuHomePhabricator
Differential D4810

[web] Use threadInfo.uiName for child chat modals
ClosedPublic
Actions

Authored by ashoat on Aug 11 2022, 8:19 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 12:14 AM
Unknown Object (File)
Fri, Apr 4, 1:55 AM
Unknown Object (File)
Mar 11 2025, 6:06 PM
Unknown Object (File)
Mar 8 2025, 11:38 AM
Unknown Object (File)
Mar 6 2025, 6:35 AM
Unknown Object (File)
Mar 6 2025, 6:35 AM
Unknown Object (File)
Mar 6 2025, 6:35 AM
Unknown Object (File)
Mar 1 2025, 12:22 PM
View All Files
Subscribers
• abosh
• adrian
tomek

Details

Reviewers
• jacek
atul
Commits
rCOMM7a92534795e0: [web] Use threadInfo.uiName for child chat modals
Summary

We should always use uiName instead of name, since name can be empty. We do the same thing on native.

Test Plan

I tested this in my local environment and confirmed the empty names became non-empty

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
web/
modals/
threads/
sidebars/
2 lines
subchannels/
2 lines

Diff 15573

View Options

web/modals/threads/sidebars/sidebar.react.js

// @flow // @flow
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import invariant from 'invariant'; import invariant from 'invariant';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import Orientation from 'react-native-orientation-locker'; import Orientation from 'react-native-orientation-locker';
import { createMigrate, createTransform } from 'redux-persist'; import { createMigrate, createTransform } from 'redux-persist';
import type { Transform } from 'redux-persist/es/types.js'; import type { Transform } from 'redux-persist/es/types.js';
import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js'; import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js'; import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import { import {
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js'; import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js'; import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import { import {
type LocalMessageInfo, type LocalMessageInfo,
type MessageStore, type MessageStore,
messageTypes, messageTypes,
type ClientDBMessageStoreOperation, type ClientDBMessageStoreOperation,
type ClientDBMessageInfo,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
translateClientDBMessageInfoToRawMessageInfo,
translateRawMessageInfoToClientDBMessageInfo,
} from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js'; import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js'; import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';
import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js'; import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js'; import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js'; import { defaultGlobalThemeInfo } from '../types/themes.js';
import { isTaskCancelledError } from '../utils/error-handling.js'; import { isTaskCancelledError } from '../utils/error-handling.js';
const migrations = { const migrations = {
[1]: (state: AppState) => ({ [1]: (state: AppState) => ({
...state, ...state,
▲ Show 20 Lines • Show All 338 Lines • ▼ Show 20 Lines try {
console.log(exception); console.log(exception);
if (isTaskCancelledError(exception)) { if (isTaskCancelledError(exception)) {
return state; return state;
} }
return { ...state, cookie: null }; return { ...state, cookie: null };
} }
return state; return state;
}, },
[32]: (state: AppState) => { [32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
// 1. Get messages from SQLite `messages` table. [33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[33]: (state: AppState) => {
// 1. Get messages from SQLite `messages` table.
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[34]: state => { [34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state; const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs; return stateSansThreadIDsToNotifIDs;
}, },
}; };
// After migration 31, we'll no longer want to persist `messageStore.messages` // After migration 31, we'll no longer want to persist `messageStore.messages`
// via redux-persist. However, we DO want to continue persisting everything in // via redux-persist. However, we DO want to continue persisting everything in
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines
View Options

web/modals/threads/subchannels/subchannel.react.js

// @flow // @flow
import AsyncStorage from '@react-native-async-storage/async-storage'; import AsyncStorage from '@react-native-async-storage/async-storage';
import invariant from 'invariant'; import invariant from 'invariant';
import { Platform } from 'react-native'; import { Platform } from 'react-native';
import Orientation from 'react-native-orientation-locker'; import Orientation from 'react-native-orientation-locker';
import { createMigrate, createTransform } from 'redux-persist'; import { createMigrate, createTransform } from 'redux-persist';
import type { Transform } from 'redux-persist/es/types.js'; import type { Transform } from 'redux-persist/es/types.js';
import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js'; import { highestLocalIDSelector } from 'lib/selectors/local-id-selectors.js';
import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js'; import { inconsistencyResponsesToReports } from 'lib/shared/report-utils.js';
import { import {
getContainingThreadID, getContainingThreadID,
getCommunity, getCommunity,
} from 'lib/shared/thread-utils.js'; } from 'lib/shared/thread-utils.js';
import { import { DEPRECATED_unshimMessageStore } from 'lib/shared/unshim-utils.js';
DEPRECATED_unshimMessageStore,
unshimFunc,
} from 'lib/shared/unshim-utils.js';
import { defaultEnabledApps } from 'lib/types/enabled-apps.js'; import { defaultEnabledApps } from 'lib/types/enabled-apps.js';
import { defaultCalendarFilters } from 'lib/types/filter-types.js'; import { defaultCalendarFilters } from 'lib/types/filter-types.js';
import { import {
type LocalMessageInfo, type LocalMessageInfo,
type MessageStore, type MessageStore,
messageTypes, messageTypes,
type ClientDBMessageStoreOperation, type ClientDBMessageStoreOperation,
type ClientDBMessageInfo,
} from 'lib/types/message-types.js'; } from 'lib/types/message-types.js';
import { defaultConnectionInfo } from 'lib/types/socket-types.js'; import { defaultConnectionInfo } from 'lib/types/socket-types.js';
import { import { translateRawMessageInfoToClientDBMessageInfo } from 'lib/utils/message-ops-utils.js';
translateClientDBMessageInfoToRawMessageInfo,
translateRawMessageInfoToClientDBMessageInfo,
} from 'lib/utils/message-ops-utils.js';
import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js'; import { defaultNotifPermissionAlertInfo } from 'lib/utils/push-alerts.js';
import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js'; import { convertThreadStoreOperationsToClientDBOperations } from 'lib/utils/thread-ops-utils.js';
import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js'; import { migrateThreadStoreForEditThreadPermissions } from './edit-thread-permission-migration.js';
import type { AppState } from './state-types.js'; import type { AppState } from './state-types.js';
import { unshimClientDB } from './unshim-utils.js';
import { commCoreModule } from '../native-modules.js'; import { commCoreModule } from '../native-modules.js';
import { defaultDeviceCameraInfo } from '../types/camera.js'; import { defaultDeviceCameraInfo } from '../types/camera.js';
import { defaultGlobalThemeInfo } from '../types/themes.js'; import { defaultGlobalThemeInfo } from '../types/themes.js';
import { isTaskCancelledError } from '../utils/error-handling.js'; import { isTaskCancelledError } from '../utils/error-handling.js';
const migrations = { const migrations = {
[1]: (state: AppState) => ({ [1]: (state: AppState) => ({
...state, ...state,
▲ Show 20 Lines • Show All 338 Lines • ▼ Show 20 Lines try {
console.log(exception); console.log(exception);
if (isTaskCancelledError(exception)) { if (isTaskCancelledError(exception)) {
return state; return state;
} }
return { ...state, cookie: null }; return { ...state, cookie: null };
} }
return state; return state;
}, },
[32]: (state: AppState) => { [32]: (state: AppState) => unshimClientDB(state, [messageTypes.MULTIMEDIA]),
// 1. Get messages from SQLite `messages` table. [33]: (state: AppState) => unshimClientDB(state, [messageTypes.REACTION]),
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.MULTIMEDIA])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[33]: (state: AppState) => {
// 1. Get messages from SQLite `messages` table.
const clientDBMessageInfos = commCoreModule.getAllMessagesSync();
// 2. Translate `ClientDBMessageInfo`s to `RawMessageInfo`s.
const rawMessageInfos = clientDBMessageInfos.map(
translateClientDBMessageInfoToRawMessageInfo,
);
// 3. "Unshim" translated `RawMessageInfo`s.
const unshimmedRawMessageInfos = rawMessageInfos.map(messageInfo =>
unshimFunc(messageInfo, new Set([messageTypes.REACTION])),
);
// 4. Translate unshimmed `RawMessageInfo`s back to `ClientDBMessageInfo`s.
const unshimmedClientDBMessageInfos = unshimmedRawMessageInfos.map(
translateRawMessageInfoToClientDBMessageInfo,
);
// 5. Construct `ClientDBMessageStoreOperation`s to clear SQLite `messages`
// table and repopulate with unshimmed `ClientDBMessageInfo`s.
const operations: $ReadOnlyArray<ClientDBMessageStoreOperation> = [
{
type: 'remove_all',
},
...unshimmedClientDBMessageInfos.map((message: ClientDBMessageInfo) => ({
type: 'replace',
payload: message,
})),
];
// 6. Try processing `ClientDBMessageStoreOperation`s and log out if
// `processMessageStoreOperationsSync(...)` throws an exception.
try {
commCoreModule.processMessageStoreOperationsSync(operations);
} catch (exception) {
console.log(exception);
return { ...state, cookie: null };
}
return state;
},
[34]: state => { [34]: state => {
const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state; const { threadIDsToNotifIDs, ...stateSansThreadIDsToNotifIDs } = state;
return stateSansThreadIDsToNotifIDs; return stateSansThreadIDsToNotifIDs;
}, },
}; };
// After migration 31, we'll no longer want to persist `messageStore.messages` // After migration 31, we'll no longer want to persist `messageStore.messages`
// via redux-persist. However, we DO want to continue persisting everything in // via redux-persist. However, we DO want to continue persisting everything in
▲ Show 20 Lines • Show All 97 Lines • Show Last 20 Lines