void;
+ title?: string;
+ description?: string;
}
export default function NoPermissionsView(props: Props) {
return (
<>
+
+
+
+
+
diff --git a/webapp/channels/src/components/query_param_actions/query_param_action_controller.test.tsx b/webapp/channels/src/components/query_param_actions/query_param_action_controller.test.tsx
new file mode 100644
index 0000000000..4243a7a5b1
--- /dev/null
+++ b/webapp/channels/src/components/query_param_actions/query_param_action_controller.test.tsx
@@ -0,0 +1,116 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import React from 'react';
+import {useDispatch} from 'react-redux';
+import {MemoryRouter, Route, useHistory} from 'react-router-dom';
+
+import {openModal} from 'actions/views/modals';
+
+import {renderWithContext} from 'tests/react_testing_utils';
+
+import QueryParamActionController from './query_param_action_controller';
+
+// Mock react-redux since we just care about calling logic
+jest.mock('react-redux', () => ({
+ ...jest.requireActual('react-redux'),
+ useDispatch: jest.fn(),
+}));
+
+jest.mock('actions/views/modals', () => ({
+ openModal: jest.fn(),
+}));
+
+jest.mock('react-router-dom', () => ({
+ ...jest.requireActual('react-router-dom'),
+ useHistory: jest.fn(),
+}));
+
+describe('QueryParamActionController', () => {
+ let mockDispatch: jest.Mock;
+
+ // Define a custom type for mockHistory that includes the replace method
+ interface MockHistory extends jest.Mock {
+ replace: jest.Mock;
+ }
+ let mockHistory: MockHistory;
+
+ beforeEach(() => {
+ mockDispatch = jest.fn();
+ (useDispatch as jest.Mock).mockReturnValue(mockDispatch);
+ mockHistory = {
+ replace: jest.fn(),
+ } as MockHistory;
+ (useHistory as jest.Mock).mockReturnValue(mockHistory);
+ });
+
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it('should dispatch openModal for INVITATION modal ID when passed valid open_invitation_modal action', () => {
+ renderWithContext(
+
+
+ ,
+ );
+
+ expect(mockDispatch).toHaveBeenCalledWith(
+ openModal({
+ modalId: 'INVITATION',
+ dialogType: expect.any(Function),
+ }),
+ );
+ });
+
+ it('should not dispatch any action when action query parameter is not present', () => {
+ renderWithContext(
+
+
+ ,
+ );
+
+ expect(mockDispatch).not.toHaveBeenCalled();
+ });
+
+ it('should not dispatch any action when action query parameter is not in list', () => {
+ renderWithContext(
+
+
+ ,
+ );
+
+ expect(mockDispatch).not.toHaveBeenCalled();
+ });
+
+ it('should remove the action query parameter after dispatching the action', () => {
+ renderWithContext(
+
+
+ ,
+ );
+
+ expect(mockDispatch).toHaveBeenCalledWith(
+ openModal({
+ modalId: 'INVITATION',
+ dialogType: expect.any(Function),
+ }),
+ );
+
+ expect(mockHistory.replace).toHaveBeenCalledWith({
+ search: '',
+ });
+ });
+});
diff --git a/webapp/channels/src/components/query_param_actions/query_param_action_controller.tsx b/webapp/channels/src/components/query_param_actions/query_param_action_controller.tsx
new file mode 100644
index 0000000000..a2c7e64d0e
--- /dev/null
+++ b/webapp/channels/src/components/query_param_actions/query_param_action_controller.tsx
@@ -0,0 +1,50 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See LICENSE.txt for license information.
+
+import {useEffect} from 'react';
+import {useDispatch} from 'react-redux';
+import {useHistory, useLocation} from 'react-router-dom';
+
+import {openModal} from 'actions/views/modals';
+
+import InvitationModal from 'components/invitation_modal';
+
+import {ModalIdentifiers} from 'utils/constants';
+
+import type {ModalData} from 'types/actions';
+
+interface ActionMap {
+ [key: string]: ModalData;
+}
+
+function QueryParamActionController() {
+ const location = useLocation();
+ const dispatch = useDispatch();
+ const history = useHistory();
+
+ const actionMap: ActionMap = {
+ open_invitation_modal: {
+ modalId: ModalIdentifiers.INVITATION,
+ dialogType: InvitationModal,
+ },
+ };
+
+ useEffect(() => {
+ const searchParams = new URLSearchParams(location.search);
+ const action = searchParams.get('action');
+
+ if (action && actionMap[action]) {
+ dispatch(openModal(actionMap[action]));
+
+ // Delete the action after it's been invoked so that it's not locked for subsequent refreshes
+ searchParams.delete('action');
+ history.replace({
+ search: searchParams.toString(),
+ });
+ }
+ }, [location, actionMap]);
+
+ return null;
+}
+
+export default QueryParamActionController;
diff --git a/webapp/channels/src/components/root/actions/index.ts b/webapp/channels/src/components/root/actions/index.ts
index 3a4d91d09d..c101327fa5 100644
--- a/webapp/channels/src/components/root/actions/index.ts
+++ b/webapp/channels/src/components/root/actions/index.ts
@@ -99,12 +99,12 @@ export function registerCustomPostRenderer(type: string, component: any, id: str
};
}
-export function redirectToOnboardingOrDefaultTeam(history: History): ThunkActionFunc {
+export function redirectToOnboardingOrDefaultTeam(history: History, searchParams?: URLSearchParams): ThunkActionFunc {
return async (dispatch, getState) => {
const state = getState();
const isUserAdmin = isCurrentUserSystemAdmin(state);
if (!isUserAdmin) {
- redirectUserToDefaultTeam();
+ redirectUserToDefaultTeam(searchParams);
return;
}
@@ -113,19 +113,19 @@ export function redirectToOnboardingOrDefaultTeam(history: History): ThunkAction
const onboardingFlowEnabled = getIsOnboardingFlowEnabled(state);
if (teams.length > 0 || !onboardingFlowEnabled) {
- redirectUserToDefaultTeam();
+ redirectUserToDefaultTeam(searchParams);
return;
}
const firstAdminSetupComplete = await dispatch(getFirstAdminSetupComplete());
if (firstAdminSetupComplete?.data) {
- redirectUserToDefaultTeam();
+ redirectUserToDefaultTeam(searchParams);
return;
}
const profilesResult = await dispatch(getProfiles(0, General.PROFILE_CHUNK_SIZE, {roles: General.SYSTEM_ADMIN_ROLE}));
if (profilesResult.error) {
- redirectUserToDefaultTeam();
+ redirectUserToDefaultTeam(searchParams);
return;
}
const currentUser = getCurrentUser(getState());
@@ -141,7 +141,7 @@ export function redirectToOnboardingOrDefaultTeam(history: History): ThunkAction
return;
}
- redirectUserToDefaultTeam();
+ redirectUserToDefaultTeam(searchParams);
};
}
diff --git a/webapp/channels/src/components/root/root.tsx b/webapp/channels/src/components/root/root.tsx
index 6bba0340a2..7d57f60caa 100644
--- a/webapp/channels/src/components/root/root.tsx
+++ b/webapp/channels/src/components/root/root.tsx
@@ -317,7 +317,7 @@ export default class Root extends React.PureComponent {
if (isUserAtRootRoute) {
if (isMeRequested) {
- this.props.actions.redirectToOnboardingOrDefaultTeam(this.props.history);
+ this.props.actions.redirectToOnboardingOrDefaultTeam(this.props.history, new URLSearchParams(this.props.location.search));
} else if (this.props.noAccounts) {
this.props.history.push('/signup_user_complete');
}
diff --git a/webapp/channels/src/components/root/root_redirect/root_redirect.tsx b/webapp/channels/src/components/root/root_redirect/root_redirect.tsx
index 3a1db8624e..199aec748a 100644
--- a/webapp/channels/src/components/root/root_redirect/root_redirect.tsx
+++ b/webapp/channels/src/components/root/root_redirect/root_redirect.tsx
@@ -2,7 +2,7 @@
// See LICENSE.txt for license information.
import React, {useEffect} from 'react';
-import {Redirect, useHistory} from 'react-router-dom';
+import {Redirect, useHistory, useLocation} from 'react-router-dom';
import type {ActionResult} from 'mattermost-redux/types/actions';
@@ -21,6 +21,7 @@ export type Props = {
export default function RootRedirect(props: Props) {
const history = useHistory();
+ const location = useLocation();
useEffect(() => {
if (props.currentUserId) {
@@ -30,11 +31,11 @@ export default function RootRedirect(props: Props) {
if (firstAdminCompletedSignup.data === false && props.isFirstAdmin && !props.areThereTeams) {
history.push('/preparing-workspace');
} else {
- GlobalActions.redirectUserToDefaultTeam();
+ GlobalActions.redirectUserToDefaultTeam(new URLSearchParams(location.search));
}
});
} else {
- GlobalActions.redirectUserToDefaultTeam();
+ GlobalActions.redirectUserToDefaultTeam(new URLSearchParams(location.search));
}
}
}, [props.currentUserId, props.isElegibleForFirstAdmingOnboarding]);
diff --git a/webapp/channels/src/i18n/en.json b/webapp/channels/src/i18n/en.json
index 8386b1f190..0cb42ea4c5 100644
--- a/webapp/channels/src/i18n/en.json
+++ b/webapp/channels/src/i18n/en.json
@@ -4011,7 +4011,7 @@
"invite_modal.invited_guests": "Guests",
"invite_modal.invited_members": "Members",
"invite_modal.no_permissions.description": "You do not have permissions to add users or guests. If this seems like an error, please reach out to your system administrator.",
- "invite_modal.no_permissions.title": "Unable to continue",
+ "invite_modal.no_permissions.title": "Unable to invite people",
"invite_modal.people": "people",
"invite_modal.restricted_invite_guest.post_trial_description": "Collaborate with users outside of your organization while tightly controlling their access to channels and team members. Upgrade to the Professional plan to create unlimited user groups.",
"invite_modal.restricted_invite_guest.post_trial_title": "Upgrade to invite guest",