Skip to content

Commit

Permalink
Merge branch 'chore/change-app-request-notify-admins-message' of gith…
Browse files Browse the repository at this point in the history 
…ub.com:RocketChat/Rocket.Chat into chore/change-app-request-notify-admins-message
  • Loading branch information
@rique223
rique223 committed Feb 28, 2023
2 parents ad34b94 + 1fc7a4f commit 7740852
Show file tree
Hide file tree
Showing 13 changed files with 409 additions and 295 deletions.
19 changes: 15 additions & 4 deletions apps/meteor/app/federation-v2/server/Federation.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const allowedActionsInFederatedRooms: ValueOf<typeof RoomMemberActions>[] = [
RoomMemberActions.LEAVE,
];

const allowedActionsForModerators = allowedActionsInFederatedRooms.filter((action) => action !== RoomMemberActions.SET_AS_OWNER);

const allowedRoomSettingsChangesInFederatedRooms: ValueOf<typeof RoomSettingsEnum>[] = [RoomSettingsEnum.NAME, RoomSettingsEnum.TOPIC];

export class Federation {
Expand All @@ -33,10 +35,19 @@ export class Federation {
return true;
}

return Boolean(
(userSubscription.roles?.includes('owner') || userSubscription.roles?.includes('moderator')) &&
allowedActionsInFederatedRooms.includes(action),
);
if (action === RoomMemberActions.LEAVE) {
return true;
}

if (userSubscription.roles?.includes('owner')) {
return allowedActionsInFederatedRooms.includes(action);
}

if (userSubscription.roles?.includes('moderator')) {
return allowedActionsForModerators.includes(action);
}

return false;
}

public static isAFederatedUsername(username: string): boolean {
Expand Down
77 changes: 38 additions & 39 deletions ...pp/ui-message/client/popup/components/composerBoxPopupPreview/ComposerBoxPopupPreview.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,45 +25,44 @@ const ComposerBoxPopupPreview = forwardRef<
const executeSlashCommandPreviewMethod = useMethod('executeSlashCommandPreview');
useImperativeHandle(
ref,
() =>
suspended
? {}
: {
getFilter: () => {
const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
if (!value) {
throw new Error('No value');
}
const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);

if (!matches) {
throw new Error('No matches');
}

const cmd = matches[1].replace('/', '').trim().toLowerCase();

const params = matches[2];
return { cmd, params, msg: { rid, tmid } };
},
select: (item) => {
const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
if (!value) {
throw new Error('No value');
}
const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);

if (!matches) {
throw new Error('No matches');
}

const cmd = matches[1].replace('/', '').trim().toLowerCase();

const params = matches[2];
// TODO: Fix this solve the typing issue
executeSlashCommandPreviewMethod({ cmd, params, msg: { rid, tmid } }, { id: item._id, type: item.type, value: item.value });
chat?.composer?.setText('');
},
},
() => ({
getFilter: () => {
const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
if (!value) {
throw new Error('No value');
}
const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);

if (!matches) {
throw new Error('No matches');
}

const cmd = matches[1].replace('/', '').trim().toLowerCase();

const params = matches[2];
return { cmd, params, msg: { rid, tmid } };
},
...(!suspended && {
select: (item) => {
const value = chat?.composer?.substring(0, chat?.composer?.selection.start);
if (!value) {
throw new Error('No value');
}
const matches = value.match(/(\/[\w\d\S]+ )([^]*)$/);

if (!matches) {
throw new Error('No matches');
}

const cmd = matches[1].replace('/', '').trim().toLowerCase();

const params = matches[2];
// TODO: Fix this solve the typing issue
executeSlashCommandPreviewMethod({ cmd, params, msg: { rid, tmid } }, { id: item._id, type: item.type, value: item.value });
chat?.composer?.setText('');
},
}),
}),
[chat?.composer, executeSlashCommandPreviewMethod, rid, tmid, suspended],
);

Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/ui-message/client/popup/hooks/useComposerBoxPopup.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export const useComposerBoxPopup = <T extends { _id: string; sort?: number }>({
});

const keydown = useMutableCallback((event: KeyboardEvent) => {
if (!popup || popup.preview) {
if (!popup) {
return;
}

Expand Down
142 changes: 29 additions & 113 deletions apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,18 @@ import type { App } from '@rocket.chat/core-typings';
import { Box, Button, Icon, Throbber, Tag, Margins } from '@rocket.chat/fuselage';
import { useSafely } from '@rocket.chat/fuselage-hooks';
import type { TranslationKey } from '@rocket.chat/ui-contexts';
import {
useRouteParameter,
usePermission,
useSetModal,
useTranslation,
useToastMessageDispatch,
useEndpoint,
} from '@rocket.chat/ui-contexts';
import { useRouteParameter, usePermission, useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
import type { ReactElement } from 'react';
import React, { useCallback, useState, memo } from 'react';
import semver from 'semver';

import { Apps } from '../../../../../../ee/client/apps/orchestrator';
import AppPermissionsReviewModal from '../../../AppPermissionsReviewModal';
import IframeModal from '../../../IframeModal';
import type { appStatusSpanResponseProps } from '../../../helpers';
import { appButtonProps, appMultiStatusProps, handleAPIError, handleInstallError } from '../../../helpers';
import { appButtonProps, appMultiStatusProps } from '../../../helpers';
import { marketplaceActions } from '../../../helpers/marketplaceActions';
import type { AppInstallationHandlerParams } from '../../../hooks/useAppInstallationHandler';
import { useAppInstallationHandler } from '../../../hooks/useAppInstallationHandler';
import AppStatusPriceDisplay from './AppStatusPriceDisplay';

type AppRequestPostMessage = {
message: string;
status: string;
};

type AppStatusProps = {
app: App;
showStatus?: boolean;
Expand All @@ -38,7 +25,7 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
const t = useTranslation();
const [endUserRequested, setEndUserRequested] = useState(false);
const [loading, setLoading] = useSafely(useState(false));
const [isAppPurchased, setPurchased] = useSafely(useState(app?.isPurchased));
const [isAppPurchased, setPurchased] = useSafely(useState(!!app?.isPurchased));
const setModal = useSetModal();
const isAdminUser = usePermission('manage-apps');
const context = useRouteParameter('context');
Expand All @@ -54,114 +41,42 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro

const totalSeenRequests = app?.appRequestStats?.totalSeen;
const totalUnseenRequests = app?.appRequestStats?.totalUnseen;
const dispatchToastMessage = useToastMessageDispatch();

const notifyAdmins = useEndpoint('POST', '/apps/notify-admins');
const requestConfirmAction = (postMessage: AppRequestPostMessage) => {
setModal(null);
setLoading(false);
dispatchToastMessage({ type: 'success', message: 'App request submitted' });

setEndUserRequested(true);

notifyAdmins({
appId: app.id,
appName: app.name,
appVersion: app.marketplaceVersion,
message: postMessage.message,
});
};

if (button?.action === undefined && button?.action) {
throw new Error('action must not be null');
}

const action = button?.action;
const confirmAction = useCallback(
(permissionsGranted) => {
setModal(null);

if (action === undefined) {
setLoading(false);
return;
const confirmAction = useCallback<AppInstallationHandlerParams['onSuccess']>(
async (action, permissionsGranted) => {
if (action !== 'request' && !!permissionsGranted) {
setPurchased(true);
await marketplaceActions[action]({ ...app, permissionsGranted });
} else {
setEndUserRequested(true);
}

if (action !== 'request') {
marketplaceActions[action]({ ...app, permissionsGranted }).then(() => {
setLoading(false);
});
}
setLoading(false);
},
[setModal, action, app, setLoading],
[app, setLoading, setPurchased],
);

const cancelAction = useCallback(() => {
setLoading(false);
setModal(null);
}, [setLoading, setModal]);

const showAppPermissionsReviewModal = (): void => {
if (!isAppPurchased) {
setPurchased(true);
}

if (!app.permissions || app.permissions.length === 0) {
return confirmAction(app.permissions);
}

if (!Array.isArray(app.permissions)) {
handleInstallError(new Error('The "permissions" property from the app manifest is invalid'));
}

return setModal(<AppPermissionsReviewModal appPermissions={app.permissions} onCancel={cancelAction} onConfirm={confirmAction} />);
};

const openIncompatibleModal = async (app: App, action: string, cancel: () => void): Promise<void> => {
try {
const incompatibleData = await Apps.buildIncompatibleExternalUrl(app.id, app.marketplaceVersion, action);
setModal(<IframeModal url={incompatibleData.url} cancel={cancel} confirm={cancel} />);
} catch (e: any) {
handleAPIError(e);
}
};

const openPurchaseModal = async (app: App): Promise<void> => {
try {
const data = await Apps.buildExternalUrl(app.id, app.purchaseType, false);
setModal(<IframeModal url={data.url} cancel={cancelAction} confirm={showAppPermissionsReviewModal} />);
} catch (error) {
handleAPIError(error);
}
};

const handleClick = async (e: React.MouseEvent<HTMLElement>): Promise<void> => {
e.preventDefault();
e.stopPropagation();
const appInstallationHandler = useAppInstallationHandler({
app,
action: action || 'purchase',
isAppPurchased,
onDismiss: cancelAction,
onSuccess: confirmAction,
});

const handleAcquireApp = useCallback(() => {
setLoading(true);
appInstallationHandler();
}, [appInstallationHandler, setLoading]);

if (action === 'request') {
try {
const data = await Apps.buildExternalAppRequest(app.id);
setModal(<IframeModal url={data?.url} wrapperHeight={'x460'} cancel={cancelAction} confirm={requestConfirmAction} />);
} catch (error) {
handleAPIError(error);
}
return;
}

if (app.versionIncompatible && action !== undefined) {
openIncompatibleModal(app, action, cancelAction);
return;
}

if (action !== undefined && action === 'purchase' && !isAppPurchased) {
openPurchaseModal(app);
return;
}

showAppPermissionsReviewModal();
};

// @TODO we should refactor this to not use the label to determine the variant
const getStatusVariant = (status: appStatusSpanResponseProps) => {
if (isAppRequestsPage && totalUnseenRequests && (status.label === 'request' || status.label === 'requests')) {
return 'primary';
Expand All @@ -171,7 +86,8 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
return undefined;
}

if (status.label === 'Disabled') {
// includes() here because the label can be 'Disabled' or 'Disabled*'
if (status.label.includes('Disabled')) {
return 'secondary-danger';
}

Expand Down Expand Up @@ -211,7 +127,7 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
primary
small
disabled={loading || (action === 'request' && (app?.requestedEndUser || endUserRequested))}
onClick={handleClick}
onClick={handleAcquireApp}
mie='x8'
>
{loading ? (
Expand Down

0 comments on commit 7740852

Please sign in to comment.