mirror of
https://github.com/grafana/grafana.git
synced 2024-12-02 05:29:42 -06:00
a55a272276
* Add router packages * Get react app root work instead of Angular one * Logger util * Patch Angular routing ($routeProvider, $routeParamsProvider) * Use react-router-dom history instead of separate dependency * Add test routes * Sidemenu - use Link instead of anchors * Patch Angular $location service (stub) * WIP: geting rid of $location provider from TimeSrv * Intercept anchor clicks to use history under the hood * Sync Redux location slice with history state * Make login/logout work * Debug routes for testing * Make force login work * Make sure query param change does not recreate page components * Hide side menu in specified locations * Make the dashboar route query parameters work, make panel edit menu work * Enable more routes * Fix side menu * Handle view modes * Disable playlist routes * Make SafeDynamicImport work again * Bring back router-debug * Separate redux location sync from route rendering * Refactor updateLocation to thunk and move force refresh(login) to it * Fixing init dashboard issue * Support switching between dashboards without an unmount of DashboardPage * More fixes for init dashboard and panel edit * More type fixes * Moving angular location wrapper out of main LocationService, and fixing typescript issues * Fixed last typescript errors * LocationService: Move to runtime and remove getLocationService and export singleston const instead (#31523) * Moving location service implementation to runtime and removing get function and making it a package const singleton * Added test that used locationService directly * removed unused import * AngularApp: Moving angular dependencies and the app boot out of the main app into it's own file (#31525) * Fixes angular panels by calling the monkey patch * Moving angular stuff to to it's own files * udpated * Fixing clicking on divs and spans inside anchor * Moving app notifications out of angular app and removing angular directive wrapper * Moving search from angular to react and removing angular search wrapper * Clean up, tried to remove the redux location wrapper but requires a big update for DashboardPage, so adding it back * Moving AppWrapper to root to limit circular dependencies (app/core -> app/routing and back) * Open and close search now works * Hide sidemenu when in kiosk mode * Restoring some keybindings like ESC key * Removed kiosk events and simplified it, just handled through updating URL * Fixing typescript errors * Simplified GrafanaRouteComponentProps and renamed to ContainerProps * renamed back * Changed AlertRuleList to use GrafanaRouteComponentProps and location.search passed to it * Removing the reloadOnSearch property, this is not needed now for react as react by default does not unmount components when only url match or query parmas change * SafeDynamicImport causing unmount un every search update, not sure how to fix yet * Fix signature for SafeDynamicImport so we do not create new route components on every route render * Removing the redux location wrapper as it was causing errors, and making dashboard page work with RouteProps (location, match) etc * Updating DashboardPage and SoloPanelPage to use match params and history location * Fixed DashboardPage tests * Fixing solo route tests * LocationService: Rename getCurrentLocation to just getLocation * do not intercept link clicks with target blank or self * Experimental useUrlParams hook * Update DataSourceSettingsPage to use router match params * fix links with urls that have no starting / to work like before * Fix forceLogin * Add queryParams to GrafanaRouteComponentProps * PanelEditor get rid of updateLocation and location state * Improve grafana route query params typing * Add getSearchObject to LocationService * Use DashboardPAge queryParams instead of location.search parsing * Fix DashboardPage typing * Fix some tests weirdness * Bring back KeyboardSrv * Fixes typescript issues * Team pages now use router match params * Get rid of from GrafanaRouteComponent props * Removed unnessary calls to getSearchObject when calling locationService.partial * Updated DashboardPage tests after queryParams was added * Fixing dashboard settings back * GrafanaRoute: Adding tests and remove use of global locationService * Fixing tests and typescript errors * Bring back kiosk modes and add tests * Fix TimeSrv tests * Fix typecheck errors * Fixing tests * Updated SideMenu test to react-testing and wrapped component in Router, and fixed issue importing createMemoryHistory * Get rid of routeChange event from TimeSrv from * Fixed TopSectionItem test * Trying to make basename work but failing * Update TopSectionItem snapshot * Fix TopSectionItem snapshot test * Fix API keys creation * Remove Angular dependencies from KeybindingSrv (#31617) * Remove Angular dependency from KeybindingsSrv * Fix tests and typecheck issues * basename is starting to work * Make dashboard save work * KeybindingSrv: Remove as angular service and no usage angular scope * So long bridge_srv, we won't miss you * Update snapshots * Dashboard: Refactoring ChangeTracker to use History api and no angular (#31653) * Dashboard: Refactoring ChangeTracker to use History api and no angular * Updated * Removed logging * fixed unit tests * updated snapshots * Mechanism for force reloading routes (#31683) * e2e: Fixes various things in e2e scenarios after router migration (#31685) * Explore: Update reading query params from router props and updating location via locationService (ReactRouter) (#31688) * RoutingNG: Initial explore redux location to router location migration * Updated explore Wrapper tests * Fixing more tests * remove loggin * rename back to make naming consistent * Fixing return to dashboard button * fixing navigation to explore from dashboard * updated routeProps * Updated tests * Make DashboardListPage work * Fixing navigation after add new data source, and fixes explore e2e * Fixing solo panel page * PluginsPage now works * RoutingNG: When parsing and rendering url search/query params preseve old logic of handling booleans and arrays (#31725) * RoutingNG: When parsing and rendering url search/query params preserve old logic of handling booleans and arrays * Fixed test * Make snapshots list work * fixed alert notification channel edit page * Simplify LocationService, did not need special handling for login or forceLogin as target _self on link already handles that * fixed UserAdminPage * fixed edit orgs page * Fixing LdapPage * fixing dashboard import * Fixed new folder page * Fixed data source dashboards page * fixing Folder permissions and folder settings page * fixing snapshot list page nav model * remove unused file * Added placeholder page for playlist * Moved browser compatability to index-template * Restored 404/default page * Fixed reset password page * Fixed SignUpInvited page * Fixing CreateTeam, Create user page, add panel widget * Restore browwser file to make tests happy * Fixed unit tests * Removed unused import * Replacing usage of updateLocation * Fixed test * Updating search filters to use history / location service for filters * remove unused file * AppRootPage fixed * Fixing test and search issue * Changes to support enterprise extensions * remove console.log * Removing more use of redux location * Fixed signup page * removed unused old angular controllers * Fixing bugs * one final bugfix * Removed location from redux state * Fixing ts issues and tests * Fixing test issue * fixing tests * Fixing tests * removed unused stuff * Fixed search test * Adding some doc comments * Routing NG: Angular location provider patch (#31773) * Patch Angulars $location provider * Update public/app/angular/bridgeReactAngularRouting.ts * Remove only test * Update tests, disable loggers in test env * Routing NG: remove $location provider usage (#31816) * Remove dashboard_loaders * Remove $location from Analytics service, track page views form GrafanaRoute * Remove NotificationsEditCtrl * Remove Angular dependencies from uploadDashboardDirective * Update public/app/features/dashboard/containers/DashboardPage.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/features/dashboard/containers/DashboardPage.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Remove unused test helpers (#31831) * Playlist react (#31829) * playlist list in react * Playlist start * Things started to work * Updated * Handle empty list * Fix ts * Fixes and kiosk mode stuff * Removed unused events * fixing ts issue * Another ts issue * Fixing tests Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> * fixed test * Update public/app/AppWrapper.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Update public/app/AppWrapper.tsx Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com> * Remove Angular dependency from DashboardLoaderSrv (#31863) Co-authored-by: Torkel Ödegaard <torkel@grafana.com> Co-authored-by: Torkel Ödegaard <torkel@grafana.org> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
198 lines
6.6 KiB
TypeScript
198 lines
6.6 KiB
TypeScript
import {
|
|
findSelected,
|
|
getCheckedDashboardsUids,
|
|
getCheckedUids,
|
|
getFlattenedSections,
|
|
markSelected,
|
|
mergeReducers,
|
|
parseRouteParams,
|
|
} from './utils';
|
|
import { sections, searchResults } from './testData';
|
|
import { SearchQueryParams } from './types';
|
|
|
|
describe('Search utils', () => {
|
|
describe('getFlattenedSections', () => {
|
|
it('should return an array of items plus children for expanded items', () => {
|
|
const flatSections = getFlattenedSections(sections as any[]);
|
|
expect(flatSections).toHaveLength(10);
|
|
expect(flatSections).toEqual([
|
|
'Starred',
|
|
'Starred-1',
|
|
'Recent',
|
|
'2',
|
|
'2568',
|
|
'4074',
|
|
'0',
|
|
'0-4069',
|
|
'0-4072',
|
|
'0-1',
|
|
]);
|
|
});
|
|
|
|
describe('markSelected', () => {
|
|
it('should correctly mark the section item without id as selected', () => {
|
|
const results = markSelected(sections as any, 'Recent');
|
|
//@ts-ignore
|
|
expect(results[1].selected).toBe(true);
|
|
});
|
|
|
|
it('should correctly mark the section item with id as selected', () => {
|
|
const results = markSelected(sections as any, '4074');
|
|
//@ts-ignore
|
|
expect(results[4].selected).toBe(true);
|
|
});
|
|
|
|
it('should mark all other sections as not selected', () => {
|
|
const results = markSelected(sections as any, 'Starred');
|
|
const newResults = markSelected(results as any, '0');
|
|
//@ts-ignore
|
|
expect(newResults[0].selected).toBeFalsy();
|
|
expect(newResults[5].selected).toBeTruthy();
|
|
});
|
|
|
|
it('should correctly mark an item of a section as selected', () => {
|
|
const results = markSelected(sections as any, '0-4072');
|
|
expect(results[5].items[1].selected).toBeTruthy();
|
|
});
|
|
|
|
it('should not mark an item as selected for non-expanded section', () => {
|
|
const results = markSelected(sections as any, 'Recent-4072');
|
|
expect(results[1].items[0].selected).toBeFalsy();
|
|
});
|
|
|
|
it('should mark all other items as not selected', () => {
|
|
const results = markSelected(sections as any, '0-4069');
|
|
const newResults = markSelected(results as any, '0-1');
|
|
//@ts-ignore
|
|
expect(newResults[5].items[0].selected).toBeFalsy();
|
|
expect(newResults[5].items[1].selected).toBeFalsy();
|
|
expect(newResults[5].items[2].selected).toBeTruthy();
|
|
});
|
|
|
|
it('should correctly select one of the same items in different sections', () => {
|
|
const results = markSelected(sections as any, 'Starred-1');
|
|
expect(results[0].items[0].selected).toBeTruthy();
|
|
// Same item in diff section
|
|
expect(results[5].items[2].selected).toBeFalsy();
|
|
|
|
// Switch order
|
|
const newResults = markSelected(sections as any, '0-1');
|
|
expect(newResults[0].items[0].selected).toBeFalsy();
|
|
// Same item in diff section
|
|
expect(newResults[5].items[2].selected).toBeTruthy();
|
|
});
|
|
});
|
|
|
|
describe('findSelected', () => {
|
|
it('should find selected section', () => {
|
|
const results = [...sections, { id: 'Test', selected: true }];
|
|
|
|
const found = findSelected(results);
|
|
expect(found?.id).toEqual('Test');
|
|
});
|
|
|
|
it('should find selected item', () => {
|
|
const results = [{ expanded: true, id: 'Test', items: [{ id: 1 }, { id: 2, selected: true }, { id: 3 }] }];
|
|
|
|
const found = findSelected(results);
|
|
expect(found?.id).toEqual(2);
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('mergeReducers', () => {
|
|
const reducer1 = (state: any = { reducer1: false }, action: any) => {
|
|
if (action.type === 'reducer1') {
|
|
return { ...state, reducer1: !state.reducer1 };
|
|
}
|
|
return state;
|
|
};
|
|
|
|
const reducer2 = (state: any = { reducer2: false }, action: any) => {
|
|
if (action.type === 'reducer2') {
|
|
return { ...state, reducer2: !state.reducer2 };
|
|
}
|
|
return state;
|
|
};
|
|
|
|
const mergedReducers = mergeReducers([reducer1, reducer2]);
|
|
|
|
it('should merge state from all reducers into one without nesting', () => {
|
|
expect(mergedReducers({ reducer1: false }, { type: '' })).toEqual({ reducer1: false });
|
|
});
|
|
|
|
it('should correctly set state from multiple reducers', () => {
|
|
const state = { reducer1: false, reducer2: true };
|
|
const newState = mergedReducers(state, { type: 'reducer2' });
|
|
expect(newState).toEqual({ reducer1: false, reducer2: false });
|
|
const newState2 = mergedReducers(newState, { type: 'reducer1' });
|
|
expect(newState2).toEqual({ reducer1: true, reducer2: false });
|
|
});
|
|
});
|
|
|
|
describe('getCheckedUids', () => {
|
|
it('should return object with empty arrays if no checked items are available', () => {
|
|
expect(getCheckedUids(sections as any[])).toEqual({ folders: [], dashboards: [] });
|
|
});
|
|
|
|
it('should return uids for all checked items', () => {
|
|
expect(getCheckedUids(searchResults as any[])).toEqual({
|
|
folders: ['JB_zdOUWk'],
|
|
dashboards: ['lBdLINUWk', '8DY63kQZk'],
|
|
});
|
|
});
|
|
});
|
|
|
|
describe('getCheckedDashboardsUids', () => {
|
|
it('should get uids of all checked dashboards', () => {
|
|
expect(getCheckedDashboardsUids(searchResults as any[])).toEqual(['lBdLINUWk', '8DY63kQZk']);
|
|
});
|
|
});
|
|
|
|
describe('parseRouteParams', () => {
|
|
it('should remove all undefined keys', () => {
|
|
const params: Partial<SearchQueryParams> = { sort: undefined, tag: undefined, query: 'test' };
|
|
|
|
expect(parseRouteParams(params)).toEqual({
|
|
query: 'test',
|
|
});
|
|
});
|
|
|
|
it('should return tag as array, if present', () => {
|
|
//@ts-ignore
|
|
const params = { sort: undefined, tag: 'test', query: 'test' };
|
|
expect(parseRouteParams(params)).toEqual({
|
|
query: 'test',
|
|
tag: ['test'],
|
|
});
|
|
|
|
const params2: Partial<SearchQueryParams> = { sort: undefined, tag: ['test'], query: 'test' };
|
|
expect(parseRouteParams(params2)).toEqual({
|
|
query: 'test',
|
|
tag: ['test'],
|
|
});
|
|
});
|
|
|
|
it('should return sort as a SelectableValue', () => {
|
|
const params: Partial<SearchQueryParams> = { sort: 'test' };
|
|
|
|
expect(parseRouteParams(params)).toEqual({
|
|
sort: { value: 'test' },
|
|
});
|
|
});
|
|
|
|
it('should prepend folder:{folder} to the query if folder is present', () => {
|
|
expect(parseRouteParams({ folder: 'current' })).toEqual({
|
|
folder: 'current',
|
|
query: 'folder:current ',
|
|
});
|
|
// Prepend to exiting query
|
|
const params: Partial<SearchQueryParams> = { query: 'test', folder: 'current' };
|
|
expect(parseRouteParams(params)).toEqual({
|
|
folder: 'current',
|
|
query: 'folder:current test',
|
|
});
|
|
});
|
|
});
|
|
});
|