mirror of
https://github.com/mattermost/mattermost-mobile.git
synced 2026-11-06 10:50:13 +00:00
* app fixes surfaced by detox RF migration Carve the app-side bug fixes from the migrate_RF_to_detox branch into their own PR. Includes: - NavigationStore.waitUntilScreenIsTop helper + matching switchToChannel / notification.test wiring (Screens.CHANNEL_LIST -> Screens.HOME) - Detox source build + null-guard patch for Android FabricUIManagerIdlingResources (android/settings.gradle, android/app/build.gradle, gradle.properties) - iOS Podfile: Alamofire 5.10 duplicate-allHeaders patch + stdlib embed for extensions - iOS Server screen: defer push-proxy verification alert past Navigation.push to fix iOS 26 race - Android NetworkClient: null-guard host extraction to prevent NPE on bad cert reports - ephemeral_store: track recently-unsaved saved posts with 2-min TTL - post_draft: filter undefined channel observable to prevent archived-banner flicker - queries/servers/thread: is_following nullish-coalesce to false - datetime: NaN guard for invalid scheduled-message timestamp (MM-T5720) - navigation: dismissBottomSheet handles GENERIC_BOTTOM_SHEET fallback - bottom_sheet: accessibilityViewIsModal for VoiceOver - calls websocket_client: extend interface for optional sendBinary - edit_profile: wrap Save Pressable in View to constrain Detox tap bounds (MM-T4989_2/MM-T3250) - invite/summary: fix retry testID hardcoded to use the dynamic type - channel_bookmark/bookmark_link: URL resolution timeout + setBookmarkLinkUrl - categories_list/load_channel_error: missing return statement for error UI - iOS MattermostShare: TestID-friendly testIDs on Swift share-extension views - patches/react-native-network-client: Android host null-guard patch - scripts/build.sh: copy compass-icons.ttf manually when --ignore-scripts is used - types/modules: WebSocketClientInterface sendBinary extension Matched detox specs that exercise these bugs land in the rf-split/detox-tests PR. * address CodeRabbit review on PR #9789 - post_list/index.ts, thread_options/index.ts: track serverUrl in withObservables dependency keys - post/body/index.tsx: restore React.memo(Body) to avoid per-item re-render regression - thread.tsx, edit_profile.tsx: add pressed feedback via style callback; move inline typography to stylesheet - bookmark_link.tsx: include queueFetch in useDidUpdate deps - ephemeral_store.ts: complete and delete per-post recently-unsaved subjects on expiry/clear to bound growth Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: fix stale mocks and add coverage for recently-unsaved saved posts Update thread/preference tests for the new NavigationStore and prepareDestroyPermanently call paths, and add unit tests for the EphemeralStore recently-unsaved saved-post logic plus the websocket filterStaleSavedPostPreferences path. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: tighten recently-unsaved saved post assertions Address CodeRabbit nitpicks on #9789: - preference.test.ts: assert addRecentlyUnsavedSavedPost is called once with (serverUrl, postId) so the echoed websocket re-save is filtered. - ephemeral_store.test.ts: assert the observed Set size (2 after two adds, 1 after clearing one) so we catch stray/missing entries. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * docs: explain pinned posts descending sort order The asc->desc change to queryPinnedPostsInChannel surfaced during the detox RF migration was correct but undocumented. selectOrderedPosts (reached via observePinnedPostsInChannel) iterates the posts array from the end backwards expecting oldest->newest, so it requires descending (newest-first) input, matching queryPostsInChannel. Add a comment so the sort order isn't questioned in review. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * test: cover thread/config/bottom-sheet edge cases flagged in review Add unit tests for coverage gaps identified by CodeRabbit on #9789: - createThreadFromNewPost: reply where the thread is missing but the root post exists (back-fills + auto-follows), and where neither exists (only records the participant, no crash) - processReceivedThreads: thread entry with no post/participants is skipped without crashing - markThreadAsUnread: unread_replies/unread_mentions from the API response are persisted to the local thread - getConfigBooleanValue: 'true' -> true, non-'true' -> false, missing key honors the default - dismissBottomSheet: falls back to GENERIC_BOTTOM_SHEET when only the generic variant is in the stack Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * refactor(thread_options): use withServerUrl HOC Replace the hand-rolled `ThreadOptionsWithServerUrl` wrapper (which called `useServerUrl()` inside a function component and re-created the element via `React.createElement`) with the existing `withServerUrl` HOC from `@context/server`. Composition chain becomes: withDatabase(withServerUrl(enhanced(ThreadOptions))) Addresses larkox's review on app/screens/thread_options/index.ts:41: "This is not needed. You should be able to use `withServerUrl` function." Also tightens the Props type — `serverUrl` is now required (the HOC guarantees it), not optional. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com> * chore(deps): bump react-native-network-client to 1.10.2; drop workarounds 1.10.2 upstreams both fixes that were being carried locally: - iOS: apply_patches.rb is now idempotent (mattermost/react-native-network-client#167), so its bundled Alamofire diff can no longer double-apply. Removes the need for the Podfile post_install workaround that stripped the duplicate `let allHeaders` (Swift 6 / Xcode 26 "invalid redeclaration"). Workaround deleted. - Android: the cert-error host null-fallback in NetworkClient.kt is now upstream (and improved — prefers HttpUrl host, then URI, then baseUrlString; references #9789). The patch-package patch (@mattermost+react-native-network-client+1.10.0.patch) is therefore obsolete and deleted. It was also a silent no-op here anyway — named 1.10.0 while 1.10.1 was installed, so patch-package skipped it. Addresses @enahum's review on #9789: the fix belongs in network-client, not patched downstream — and it now is. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * chore(ios): update Podfile.lock for rnnc 1.10.2 Run `pod install` to sync Podfile.lock with the dependency bump in the previous commit: - react-native-network-client 1.10.1 → 1.10.2 - its pod checksum recomputed - PODFILE CHECKSUM recomputed (the Podfile changed — Alamofire duplicate-allHeaders workaround removed) The previous commit bumped package.json + ran npm install but did not regenerate Podfile.lock, so the iOS lockfile-consistency check would have failed (caught in review by @enahum). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * refactor(thread): use shared NavigationButton for header back Addresses @larkox's review on #9789: the thread route hand-rolled its header back button with a raw Pressable + CompassIcon + local StyleSheet, which is inconsistent with the rest of the app. Switch to the shared NavigationButton component — the same pattern used by app/screens/code/index.tsx, custom_status_clear_after, channel_bookmark, and the getModalHeaderOptions/getLoginModalHeaderOptions helpers (navigation.setOptions → NavigationButton with iconName/iconSize/color/ onPress/testID). Behavior is unchanged (still navigation.goBack() via handleBack) and the testID 'thread.navigation.back.button' is preserved for Detox. Net effect in the app: Android now gets the standard header ripple, a larger hitSlop touch target, and the arrow aligns like other NavigationButton headers. Removes the local styles, Pressable, StyleSheet, and CompassIcon imports. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
199 lines
8.7 KiB
TypeScript
199 lines
8.7 KiB
TypeScript
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
import {storeCategories} from '@actions/local/category';
|
|
import {General} from '@constants';
|
|
import {CHANNELS_CATEGORY, DMS_CATEGORY, FAVORITES_CATEGORY, MANAGED_CHANNEL_CATEGORIES_GROUP, MANAGED_LOCAL_CATEGORY_PREFIX} from '@constants/categories';
|
|
import DatabaseManager from '@database/manager';
|
|
import {computeManagedSortOrder, fetchManagedCategoryPropertyIds, makeManagedCategoryId, mergeManagedMappingsIntoSidebarCategories} from '@helpers/sidebar/managed_categories_merge';
|
|
import NetworkManager from '@managers/network_manager';
|
|
import {getCategoryById, getChannelCategory, queryCategoriesByTeamIds} from '@queries/servers/categories';
|
|
import {getChannelById} from '@queries/servers/channel';
|
|
import {getConfigValue, getCurrentTeamId} from '@queries/servers/system';
|
|
import {isDMorGM} from '@utils/channel';
|
|
import {getFullErrorMessage} from '@utils/errors';
|
|
import {logDebug} from '@utils/log';
|
|
import {showFavoriteChannelSnackbar} from '@utils/snack_bar';
|
|
|
|
import {forceLogoutIfNecessary} from './session';
|
|
|
|
import type ChannelModel from '@typings/database/models/servers/channel';
|
|
|
|
export type CategoriesRequest = {
|
|
categories?: CategoryWithChannels[];
|
|
error?: unknown;
|
|
}
|
|
|
|
export const fetchCategories = async (serverUrl: string, teamId: string, prune = false, fetchOnly = false, groupLabel?: RequestGroupLabel): Promise<CategoriesRequest> => {
|
|
try {
|
|
const client = NetworkManager.getClient(serverUrl);
|
|
const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
|
|
const managedCategoriesEnabled = await getConfigValue(database, 'EnableManagedChannelCategories');
|
|
|
|
const {categories: nonManagedCategories} = await client.getCategories('me', teamId, groupLabel);
|
|
let categories = nonManagedCategories;
|
|
if (managedCategoriesEnabled === 'true') {
|
|
fetchManagedCategoryPropertyIds(serverUrl);
|
|
const mappings = await client.getManagedCategories(teamId, groupLabel);
|
|
categories = await mergeManagedMappingsIntoSidebarCategories(database, teamId, nonManagedCategories, mappings);
|
|
}
|
|
|
|
if (!fetchOnly) {
|
|
storeCategories(serverUrl, categories, prune);
|
|
}
|
|
|
|
return {categories};
|
|
} catch (error) {
|
|
logDebug('error on fetchCategories', getFullErrorMessage(error));
|
|
forceLogoutIfNecessary(serverUrl, error);
|
|
return {error};
|
|
}
|
|
};
|
|
|
|
export async function addChannelToManagedCategoryIfNeeded(serverUrl: string, channel: Channel | ChannelModel) {
|
|
const teamId = 'teamId' in channel ? channel.teamId : channel.team_id;
|
|
if (!teamId || isDMorGM(channel)) {
|
|
return;
|
|
}
|
|
try {
|
|
const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
|
|
const managedEnabled = await getConfigValue(database, 'EnableManagedChannelCategories');
|
|
if (managedEnabled !== 'true') {
|
|
return;
|
|
}
|
|
const channelId = channel.id;
|
|
const client = NetworkManager.getClient(serverUrl);
|
|
const values = await client.getPropertyValues<string>(
|
|
MANAGED_CHANNEL_CATEGORIES_GROUP,
|
|
'channel',
|
|
channelId,
|
|
);
|
|
const categoryValue = values[0];
|
|
if (!categoryValue?.value || String(categoryValue.value).length === 0) {
|
|
return;
|
|
}
|
|
|
|
const categoryName = String(categoryValue.value);
|
|
const managedCategoryId = makeManagedCategoryId(teamId, categoryName);
|
|
const existingCategory = await getCategoryById(database, managedCategoryId);
|
|
|
|
const categoriesToStore: CategoryWithChannels[] = [];
|
|
let channelIds: string[];
|
|
|
|
if (existingCategory) {
|
|
const cwc = await existingCategory.toCategoryWithChannels();
|
|
channelIds = cwc.channel_ids.includes(channelId) ? cwc.channel_ids : [...cwc.channel_ids, channelId];
|
|
} else {
|
|
channelIds = [channelId];
|
|
}
|
|
|
|
const allCategories = await queryCategoriesByTeamIds(database, [teamId]).fetch();
|
|
const managedCategories = allCategories.filter((c) => c.id.startsWith(MANAGED_LOCAL_CATEGORY_PREFIX));
|
|
const managedNames = managedCategories.map((c) => c.displayName);
|
|
if (!existingCategory) {
|
|
managedNames.push(categoryName);
|
|
}
|
|
managedNames.sort((a, b) => a.localeCompare(b, undefined, {numeric: true}));
|
|
const sortedNames = [...new Set(managedNames)];
|
|
const sortOrder = computeManagedSortOrder(sortedNames.indexOf(categoryName));
|
|
|
|
const reorderPromises = managedCategories.map(async (cat) => {
|
|
const idx = sortedNames.indexOf(cat.displayName);
|
|
if (idx >= 0) {
|
|
const newOrder = computeManagedSortOrder(idx);
|
|
if (cat.sortOrder !== newOrder) {
|
|
const cwc = await cat.toCategoryWithChannels();
|
|
return {...cwc, sort_order: newOrder};
|
|
}
|
|
}
|
|
return undefined;
|
|
});
|
|
const reordered = (await Promise.all(reorderPromises)).filter(
|
|
(c): c is CategoryWithChannels => c !== undefined,
|
|
);
|
|
categoriesToStore.push(...reordered);
|
|
|
|
const managedCwc: CategoryWithChannels = {
|
|
id: managedCategoryId,
|
|
team_id: teamId,
|
|
display_name: categoryName,
|
|
sort_order: sortOrder,
|
|
sorting: 'alpha',
|
|
type: 'custom',
|
|
muted: false,
|
|
collapsed: existingCategory?.collapsed ?? false,
|
|
channel_ids: channelIds,
|
|
};
|
|
categoriesToStore.push(managedCwc);
|
|
|
|
await storeCategories(serverUrl, categoriesToStore);
|
|
} catch (error) {
|
|
logDebug('[addChannelToManagedCategoryIfNeeded]', getFullErrorMessage(error));
|
|
forceLogoutIfNecessary(serverUrl, error);
|
|
}
|
|
}
|
|
|
|
export const toggleFavoriteChannel = async (serverUrl: string, channelId: string, showSnackBar = false) => {
|
|
try {
|
|
const client = NetworkManager.getClient(serverUrl);
|
|
const {database} = DatabaseManager.getServerDatabaseAndOperator(serverUrl);
|
|
|
|
const channel = await getChannelById(database, channelId);
|
|
if (!channel) {
|
|
return {error: 'channel not found'};
|
|
}
|
|
|
|
const currentTeamId = await getCurrentTeamId(database);
|
|
const teamId = channel?.teamId || currentTeamId;
|
|
const currentCategory = await getChannelCategory(database, teamId, channelId);
|
|
|
|
if (!currentCategory) {
|
|
return {error: 'channel does not belong to a category'};
|
|
}
|
|
|
|
const categories = await queryCategoriesByTeamIds(database, [teamId]).fetch();
|
|
const isFavorited = currentCategory.type === FAVORITES_CATEGORY;
|
|
let targetWithChannels: CategoryWithChannels;
|
|
let favoriteWithChannels: CategoryWithChannels;
|
|
|
|
if (isFavorited) {
|
|
const categoryType = (channel.type === General.DM_CHANNEL || channel.type === General.GM_CHANNEL) ? DMS_CATEGORY : CHANNELS_CATEGORY;
|
|
const targetCategory = categories.find((c) => c.type === categoryType);
|
|
if (!targetCategory) {
|
|
return {error: 'target category not found'};
|
|
}
|
|
targetWithChannels = await targetCategory.toCategoryWithChannels();
|
|
targetWithChannels.channel_ids.unshift(channelId);
|
|
|
|
favoriteWithChannels = await currentCategory.toCategoryWithChannels();
|
|
const channelIndex = favoriteWithChannels.channel_ids.indexOf(channelId);
|
|
favoriteWithChannels.channel_ids.splice(channelIndex, 1);
|
|
} else {
|
|
const favoritesCategory = categories.find((c) => c.type === FAVORITES_CATEGORY);
|
|
if (!favoritesCategory) {
|
|
return {error: 'No favorites category'};
|
|
}
|
|
favoriteWithChannels = await favoritesCategory.toCategoryWithChannels();
|
|
favoriteWithChannels.channel_ids.unshift(channelId);
|
|
|
|
targetWithChannels = await currentCategory.toCategoryWithChannels();
|
|
const channelIndex = targetWithChannels.channel_ids.indexOf(channelId);
|
|
targetWithChannels.channel_ids.splice(channelIndex, 1);
|
|
}
|
|
|
|
await client.updateChannelCategories('me', teamId, [targetWithChannels, favoriteWithChannels]);
|
|
fetchCategories(serverUrl, teamId, true);
|
|
|
|
if (showSnackBar) {
|
|
const onUndo = () => toggleFavoriteChannel(serverUrl, channelId, false);
|
|
showFavoriteChannelSnackbar(!isFavorited, onUndo);
|
|
}
|
|
|
|
return {data: true};
|
|
} catch (error) {
|
|
logDebug('error on toggleFavoriteChannel', getFullErrorMessage(error));
|
|
forceLogoutIfNecessary(serverUrl, error);
|
|
return {error};
|
|
}
|
|
};
|