Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Migrate Conversation to React #13528

Merged
merged 20 commits into from
Oct 4, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 54 additions & 78 deletions .betterer.results

Large diffs are not rendered by default.

69 changes: 0 additions & 69 deletions src/page/template/content/conversation.htm

This file was deleted.

85 changes: 28 additions & 57 deletions src/page/template/wire-main.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,68 +3,39 @@
data-bind="css: mainClasses()"
data-uie-name="status-webapp"
data-uie-value="is-loading">
<!-- ko stopBinding: true -->
<div id="app" class="app">
<div id="left-column" class="left-column" data-bind="css: {'left-column--light-theme': !isActivatedAccount()}">
<header><h1 class="visually-hidden" data-bind="text: t('accessibility.headings.sidebar')"></h1></header>
<!-- ko if: webappLoaded -->
<left-sidebar params="listViewModel: $root, selfUser: selfUser"></left-sidebar>
<!-- /ko -->
</div>
<div id="center-column" class="center-column">
<main-content params="contentViewModel: $root"></main-content>

<!-- ko if: state() === State.CONNECTION_REQUESTS -->
<h1 class="visually-hidden" data-bind="text: t('accessibility.headings.connectionRequests')"></h1>
<!-- ko stopBinding: true -->
<div id="app" class="app">
<div id="left-column" class="left-column" data-bind="css: {'left-column--light-theme': !isActivatedAccount()}">
<header><h1 class="visually-hidden" data-bind="text: t('accessibility.headings.sidebar')"></h1></header>
<!-- ko if: webappLoaded -->
<left-sidebar params="listViewModel: $root, selfUser: selfUser"></left-sidebar>
<!-- /ko -->
</div>

<connect-requests
params="
actionsViewModel: $root.mainViewModel.actions,
userState: $root.userState,
teamState: $root.teamState,
"
></connect-requests>
<!-- /ko -->
<!-- ko if: state() === State.CONVERSATION -->
<h1 class="visually-hidden" data-bind="text: t('accessibility.headings.conversation')"></h1>
#include('content/conversation.htm')
<!-- /ko -->
<!-- ko if: state() === State.HISTORY_EXPORT -->
<h1 class="visually-hidden" data-bind="text: t('accessibility.headings.historyExport')"></h1>
<div id="center-column" class="center-column">
<center-column params="contentViewModel: $root"></center-column>

<history-export
style="height: 100%;"
params="
backupRepository: $root.repositories.backup,
userState: $root.userState,
"
></history-export>
<!-- /ko -->
#include('modal/legal-hold.htm')
</div>

<group-creation-modal params="
conversationRepository: $root.repositories.conversation,
searchRepository: $root.repositories.search,
teamRepository: $root.repositories.team,
"></group-creation-modal>
#include('modal/legal-hold.htm')
<div class="center-column__overlay"></div>
</div>
<div id="right-column" class="right-column">
#include('panel/conversation-details.htm')
#include('panel/conversation-participants.htm')
#include('panel/add-participants.htm')
#include('panel/group-participant-user.htm')
#include('panel/group-participant-service.htm')
#include('panel/guest-options.htm')
#include('panel/services-options.htm')
#include('panel/notifications.htm')
#include('panel/participant-devices.htm')
#include('panel/timed-messages.htm')
#include('panel/message-details.htm')
<div id="right-column" class="right-column">
#include('panel/conversation-details.htm')
#include('panel/conversation-participants.htm')
#include('panel/add-participants.htm')
#include('panel/group-participant-user.htm')
#include('panel/group-participant-service.htm')
#include('panel/guest-options.htm')
#include('panel/services-options.htm')
#include('panel/notifications.htm')
#include('panel/participant-devices.htm')
#include('panel/timed-messages.htm')
#include('panel/message-details.htm')
</div>
</div>
</div>
#include('modals.htm')

#include('modals.htm')
<!-- /ko -->

<app-lock-container params="clientRepository: $root.content.repositories.client"></app-lock-container>
<warnings-container></warnings-container>
<calling-overlay-container params="
Expand Down
18 changes: 11 additions & 7 deletions src/script/components/ConnectRequests/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,34 +17,40 @@
*
*/

import {FC, useEffect, useRef} from 'react';
import {FC, useContext, useEffect, useRef} from 'react';
import {container} from 'tsyringe';

import Avatar, {AVATAR_SIZE} from 'Components/Avatar';
import ClassifiedBar from 'Components/input/ClassifiedBar';

import {registerReactComponent, useKoSubscribableChildren} from 'Util/ComponentUtil';
import {useKoSubscribableChildren} from 'Util/ComponentUtil';
import {t} from 'Util/LocalizerUtil';

import {TeamState} from '../../team/TeamState';
import {UserState} from '../../user/UserState';
import {User} from '../../entity/User';
import {ActionsViewModel} from '../../view_model/ActionsViewModel';
import {RootContext} from '../../page/RootProvider';

interface ConnectRequestsProps {
readonly actionsViewModel: ActionsViewModel;
readonly userState: UserState;
readonly teamState: TeamState;
}

const ConnectRequests: FC<ConnectRequestsProps> = ({
actionsViewModel,
userState = container.resolve(UserState),
teamState = container.resolve(TeamState),
}) => {
const connectRequestsRefEnd = useRef<HTMLDivElement | null>(null);
const temporaryConnectRequestsCount = useRef<number>(0);

const contentViewModel = useContext(RootContext);

if (!contentViewModel) {
return null;
}

const actionsViewModel = contentViewModel.mainViewModel.actions;

const {classifiedDomains} = useKoSubscribableChildren(teamState, ['classifiedDomains']);
const {connectRequests} = useKoSubscribableChildren(userState, ['connectRequests']);

Expand Down Expand Up @@ -137,5 +143,3 @@ const ConnectRequests: FC<ConnectRequestsProps> = ({
};

export default ConnectRequests;

registerReactComponent('connect-requests', ConnectRequests);
Loading