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

fix: Displaying wrong composer for archived room #31292

Merged
merged 3 commits into from Dec 26, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions apps/meteor/client/views/room/composer/ComposerArchived.tsx
@@ -0,0 +1,16 @@
import { MessageFooterCallout, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
import { useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React from 'react';

const ComposerReadOnly = (): ReactElement => {
const t = useTranslation();

return (
<MessageFooterCallout>
<MessageFooterCalloutContent>{t('Room_archived')}</MessageFooterCalloutContent>
</MessageFooterCallout>
);
};

export default ComposerReadOnly;
18 changes: 13 additions & 5 deletions apps/meteor/client/views/room/composer/ComposerContainer.tsx
Expand Up @@ -5,6 +5,7 @@ import React, { memo } from 'react';

import { useRoom } from '../contexts/RoomContext';
import ComposerAnonymous from './ComposerAnonymous';
import ComposerArchived from './ComposerArchived';
import ComposerBlocked from './ComposerBlocked';
import ComposerFederation from './ComposerFederation';
import ComposerJoinWithPassword from './ComposerJoinWithPassword';
Expand All @@ -14,6 +15,7 @@ import ComposerOmnichannel from './ComposerOmnichannel';
import ComposerReadOnly from './ComposerReadOnly';
import ComposerVoIP from './ComposerVoIP';
import { useMessageComposerIsAnonymous } from './hooks/useMessageComposerIsAnonymous';
import { useMessageComposerIsArchived } from './hooks/useMessageComposerIsArchived';
import { useMessageComposerIsBlocked } from './hooks/useMessageComposerIsBlocked';
import { useMessageComposerIsReadOnly } from './hooks/useMessageComposerIsReadOnly';

Expand All @@ -24,7 +26,9 @@ const ComposerContainer = ({ children, ...props }: ComposerMessageProps): ReactE

const isAnonymous = useMessageComposerIsAnonymous();
const isBlockedOrBlocker = useMessageComposerIsBlocked({ subscription: props.subscription });
const isReadOnly = useMessageComposerIsReadOnly(room._id, props.subscription);
const isArchived = useMessageComposerIsArchived(room._id, props.subscription);
const isReadOnly = useMessageComposerIsReadOnly(room._id);

const isOmnichannel = isOmnichannelRoom(room);
const isFederation = isRoomFederated(room);
const isVoip = isVoipRoom(room);
Expand All @@ -45,14 +49,18 @@ const ComposerContainer = ({ children, ...props }: ComposerMessageProps): ReactE
return <ComposerAnonymous />;
}

if (mustJoinWithCode) {
return <ComposerJoinWithPassword />;
}

if (isReadOnly) {
return <ComposerReadOnly />;
}

if (isArchived) {
return <ComposerArchived />;
}

if (mustJoinWithCode) {
return <ComposerJoinWithPassword />;
}

if (isBlockedOrBlocker) {
return <ComposerBlocked />;
}
Expand Down
@@ -0,0 +1,16 @@
import type { ISubscription } from '@rocket.chat/core-typings';
import { useCallback } from 'react';

import { useReactiveValue } from '../../../../hooks/useReactiveValue';
import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';

export const useMessageComposerIsArchived = (rid: string, subscription?: ISubscription): boolean => {
const isArchived = useReactiveValue(
useCallback(
() => roomCoordinator.archived(rid) || Boolean(subscription && subscription.t === 'd' && subscription.archived),
[rid, subscription],
),
);

return Boolean(isArchived);
};
@@ -1,20 +1,17 @@
import type { ISubscription, IUser } from '@rocket.chat/core-typings';
import type { IUser } from '@rocket.chat/core-typings';
import { Meteor } from 'meteor/meteor';
import { useCallback } from 'react';

import { useReactiveValue } from '../../../../hooks/useReactiveValue';
import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';

export const useMessageComposerIsReadOnly = (rid: string, subscription?: ISubscription): boolean => {
const [isReadOnly, isArchived] = useReactiveValue(
export const useMessageComposerIsReadOnly = (rid: string): boolean => {
const isReadOnly = useReactiveValue(
useCallback(
() => [
roomCoordinator.readOnly(rid, Meteor.users.findOne(Meteor.userId() as string, { fields: { username: 1 } }) as IUser),
roomCoordinator.archived(rid) || Boolean(subscription && subscription.t === 'd' && subscription.archived),
],
[rid, subscription],
() => roomCoordinator.readOnly(rid, Meteor.users.findOne(Meteor.userId() as string, { fields: { username: 1 } }) as IUser),
[rid],
),
);

return Boolean(isReadOnly || isArchived);
return Boolean(isReadOnly);
};