Browse Source

SONAR-18211 Fix application breadcrumb not updating after admin name change

tags/10.1.0.73491
7PH 11 months ago
parent
commit
35037edf04

+ 77
- 0
server/sonar-web/src/main/js/api/mocks/NavigationServiceMock.ts View File

@@ -0,0 +1,77 @@
/*
* SonarQube
* Copyright (C) 2009-2023 SonarSource SA
* mailto:info AT sonarsource DOT com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import { cloneDeep } from 'lodash';
import { mockAppState } from '../../helpers/testMocks';
import { AppState } from '../../types/appstate';
import { Extension, NavigationComponent } from '../../types/types';
import {
getComponentNavigation,
getGlobalNavigation,
getMarketplaceNavigation,
getSettingsNavigation,
} from '../navigation';

jest.mock('../navigation');

const defaultComponentNavigation: NavigationComponent = {
name: 'foo',
key: 'foo',
breadcrumbs: [],
};

export class NavigationServiceMock {
componentNavigation: NavigationComponent;

constructor() {
this.componentNavigation = cloneDeep(defaultComponentNavigation);

jest.mocked(getComponentNavigation).mockImplementation(this.handleGetComponentNavigation);
jest.mocked(getMarketplaceNavigation).mockImplementation(this.handleGetMarketplaceNavigation);
jest.mocked(getSettingsNavigation).mockImplementation(this.handleGetSettingsNavigation);
jest.mocked(getGlobalNavigation).mockImplementation(this.handleGetGlobalNavigation);
}

setComponentNavigation = (componentNavigation: NavigationComponent) => {
this.componentNavigation = cloneDeep(componentNavigation);
};

handleGetComponentNavigation = (): Promise<NavigationComponent> => {
return Promise.resolve(this.componentNavigation);
};

handleGetMarketplaceNavigation(): Promise<{ serverId: string; ncloc: number }> {
return Promise.resolve({ serverId: 'foo', ncloc: 0 });
}

handleGetSettingsNavigation(): Promise<{
extensions: Extension[];
showUpdateCenter: boolean;
}> {
return Promise.resolve({ extensions: [], showUpdateCenter: false });
}

handleGetGlobalNavigation(): Promise<AppState> {
return Promise.resolve(mockAppState());
}

reset = () => {
this.componentNavigation = cloneDeep(defaultComponentNavigation);
};
}

+ 3
- 3
server/sonar-web/src/main/js/app/components/extensions/ProjectAdminPageExtension.tsx View File

@@ -19,13 +19,13 @@
*/
import * as React from 'react';
import { useParams } from 'react-router-dom';
import { ComponentContext } from '../componentContext/ComponentContext';
import NotFound from '../NotFound';
import { ComponentContext } from '../componentContext/ComponentContext';
import Extension from './Extension';

export default function ProjectAdminPageExtension() {
const { extensionKey, pluginKey } = useParams();
const { component, onBranchesChange } = React.useContext(ComponentContext);
const { component, onBranchesChange, onComponentChange } = React.useContext(ComponentContext);

const extension =
component &&
@@ -35,7 +35,7 @@ export default function ProjectAdminPageExtension() {
);

return extension ? (
<Extension extension={extension} options={{ component, onBranchesChange }} />
<Extension extension={extension} options={{ component, onBranchesChange, onComponentChange }} />
) : (
<NotFound withContainer={false} />
);

+ 1
- 0
server/sonar-web/src/main/js/types/extension.ts View File

@@ -42,6 +42,7 @@ export interface ExtensionStartMethodParameter {
el: HTMLElement | undefined | null;
component?: Component;
onBranchesChange?: (updateBranches?: boolean, updatePRs?: boolean) => void;
onComponentChange?: (changes: Partial<Component>) => void;
currentUser: CurrentUser;
intl: IntlShape;
location: Location;

Loading…
Cancel
Save