diff --git a/app/actions/local/category.ts b/app/actions/local/category.ts index f1f9eee7e..9d21e386c 100644 --- a/app/actions/local/category.ts +++ b/app/actions/local/category.ts @@ -29,6 +29,7 @@ export const deleteCategory = async (serverUrl: string, categoryId: string) => { } }; +// LOL use this export async function storeCategories(serverUrl: string, categories: CategoryWithChannels[], prune = false, prepareRecordsOnly = false) { try { const {operator} = DatabaseManager.getServerDatabaseAndOperator(serverUrl); diff --git a/app/actions/remote/channel.ts b/app/actions/remote/channel.ts index ec136a2d1..58324d603 100644 --- a/app/actions/remote/channel.ts +++ b/app/actions/remote/channel.ts @@ -231,6 +231,8 @@ export async function createChannel(serverUrl: string, displayName: string, purp const resolvedModels = await Promise.all(channelModels); models.push(...resolvedModels.flat()); } + + // LOL const categoriesModels = await addChannelToDefaultCategory(serverUrl, channelData, true); if (categoriesModels.models?.length) { models.push(...categoriesModels.models); diff --git a/app/actions/websocket/category.ts b/app/actions/websocket/category.ts index 56fa25139..2a77803e9 100644 --- a/app/actions/websocket/category.ts +++ b/app/actions/websocket/category.ts @@ -44,6 +44,7 @@ export async function handleCategoryCreatedEvent(serverUrl: string, msg: Websock } } +// LOL export async function handleCategoryUpdatedEvent(serverUrl: string, msg: WebsocketCategoriesMessage) { let categories; diff --git a/app/queries/servers/categories.ts b/app/queries/servers/categories.ts index c3bbc778f..53201221b 100644 --- a/app/queries/servers/categories.ts +++ b/app/queries/servers/categories.ts @@ -34,6 +34,10 @@ export const queryCategoriesByTeamIds = (database: Database, teamIds: string[]) return database.get(CATEGORY).query(Q.where('team_id', Q.oneOf(teamIds))); }; +export const queryAllCategories = (database: Database) => { + return database.get(CATEGORY).query(); +}; + export async function prepareCategoriesAndCategoriesChannels(operator: ServerDataOperator, categories: CategoryWithChannels[], prune = false) { try { const {database} = operator; diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx index f02b6f873..0dd8459c9 100644 --- a/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx +++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel.tsx @@ -7,9 +7,8 @@ import {fetchChannelMemberships, getGroupMessageMembersCommonTeams} from '@actio import {PER_PAGE_DEFAULT} from '@app/client/rest/constants'; import {useServerUrl} from '@app/context/server'; -import {ConvertGMToChannelForm} from './convert_gm_to_channel_form/convert_gm_to_channel_form'; +import ConvertGMToChannelForm from './convert_gm_to_channel_form'; import {Loader} from './loader'; -import channel from '@app/constants/channel'; type Props = { channelId: string; diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx index 85da96bdf..96003ac62 100644 --- a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx +++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/convert_gm_to_channel_form.tsx @@ -36,7 +36,7 @@ type Props = { commonTeams: Team[]; profiles: UserProfile[]; locale?: string; - teammateNameDisplay: string; + teammateNameDisplay?: string; } export const ConvertGMToChannelForm = ({ diff --git a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/index.ts b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/index.ts index 039e63006..25c3146de 100644 --- a/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/index.ts +++ b/app/screens/convert_gm_to_channel/convert_gm_to_channel_form/index.ts @@ -6,13 +6,16 @@ import {switchMap, distinctUntilChanged} from '@nozbe/watermelondb/utils/rx'; import withObservables from '@nozbe/with-observables'; import {of as of$} from 'rxjs'; +import {queryAllCategories} from '@app/queries/servers/categories'; import {observeCurrentUser, observeTeammateNameDisplay} from '@app/queries/servers/user'; +import {logDebug} from '@app/utils/log'; import {ConvertGMToChannelForm} from './convert_gm_to_channel_form'; import type {WithDatabaseArgs} from '@typings/database/database'; const enhanced = withObservables([], ({database}: WithDatabaseArgs) => { + logDebug('CCCCCCCCCCC'); const locale = observeCurrentUser(database).pipe( switchMap((user) => of$(user?.locale)), distinctUntilChanged(), @@ -20,6 +23,11 @@ const enhanced = withObservables([], ({database}: WithDatabaseArgs) => { const teammateNameDisplay = observeTeammateNameDisplay(database); + logDebug('AAAAAAAAAAAAAAAAAAAAAA'); + + const allCategories = queryAllCategories(database); + logDebug(allCategories); + return { locale, teammateNameDisplay,