mirror of
https://github.com/grafana/grafana.git
synced 2025-02-20 11:48:34 -06:00
* Chore: Remove angular dependency from backendSrv * Refactor: Naive soultion for logging out unauthorized users * Refactor: Restructures to different streams * Refactor: Restructures datasourceRequest * Refactor: Flipped back if statement * Refactor: Extracted getFromFetchStream * Refactor: Extracts toFailureStream operation * Refactor: Fixes issue when options.params contains arrays * Refactor: Fixes broken test (but we need a lot more) * Refactor: Adds explaining comments * Refactor: Adds latest RxJs version so cancellations work * Refactor: Cleans up the takeUntil code * Refactor: Adds tests for request function * Refactor: Separates into smaller functions * Refactor: Adds last error tests * Started to changed so we require getBackendSrv from the @grafana-runtime when applicable. * Using the getBackendSrv from @grafana/runtime. * Changed so we use the getBackendSrv from the @grafana-runtime when possible. * Fixed so Server Admin -> Orgs works again. * Removed unused dependency. * Fixed digest issues on the Server Admin -> Users page. * Fix: Fixes digest problems in Playlists * Fix: Fixes digest issues in VersionHistory * Tests: Fixes broken tests * Fix: Fixes digest issues in Alerting => Notification channels * Fixed digest issues on the Intive page. * Fixed so we run digest after password reset email sent. * Fixed digest issue when trying to sign up account. * Fixed so the Server Admin -> Edit Org works with backendSrv * Fixed so Server Admin -> Users works with backend srv. * Fixed digest issues in Server Admin -> Orgs * Fix: Fixes digest issues in DashList plugin * Fixed digest issues on Server Admin -> users. * Fix: Fixes digest issues with Snapshots * Fixed digest issue when deleting a user. * Fix: Fixes digest issues with dashLink * Chore: Changes RxJs version to 6.5.4 which includes the same cancellation fix * Fix: Fixes digest issue when toggling folder in manage dashboards * Fix: Fixes bug in executeInOrder * Fix: Fixes digest issue with CreateFolderCtrl and FolderDashboardsCtrl * Fix: Fixes tslint error in test * Refactor: Changes default behaviour for emitted messages as before migration * Fix: Fixes various digest issues when saving, starring or deleting dashboards * Fix: Fixes digest issues with FolderPickerCtrl * Fixed digest issue. * Fixed digest issues. * Fixed issues with angular digest. * Removed the this.digest pattern. Co-authored-by: Hugo Häggmark <hugo.haggmark@gmail.com> Co-authored-by: Marcus Andersson <systemvetaren@gmail.com>
211 lines
5.5 KiB
TypeScript
211 lines
5.5 KiB
TypeScript
import _ from 'lodash';
|
|
|
|
import coreModule from 'app/core/core_module';
|
|
import impressionSrv from 'app/core/services/impression_srv';
|
|
import store from 'app/core/store';
|
|
import { contextSrv } from 'app/core/services/context_srv';
|
|
import { backendSrv } from './backend_srv';
|
|
import { Section } from '../components/manage_dashboards/manage_dashboards';
|
|
import { DashboardSearchHit } from 'app/types/search';
|
|
|
|
interface Sections {
|
|
[key: string]: Partial<Section>;
|
|
}
|
|
|
|
export class SearchSrv {
|
|
recentIsOpen: boolean;
|
|
starredIsOpen: boolean;
|
|
|
|
constructor() {
|
|
this.recentIsOpen = store.getBool('search.sections.recent', true);
|
|
this.starredIsOpen = store.getBool('search.sections.starred', true);
|
|
}
|
|
|
|
private getRecentDashboards(sections: Sections) {
|
|
return this.queryForRecentDashboards().then((result: any[]) => {
|
|
if (result.length > 0) {
|
|
sections['recent'] = {
|
|
title: 'Recent',
|
|
icon: 'fa fa-clock-o',
|
|
score: -1,
|
|
removable: true,
|
|
expanded: this.recentIsOpen,
|
|
toggle: this.toggleRecent.bind(this),
|
|
items: result,
|
|
};
|
|
}
|
|
});
|
|
}
|
|
|
|
private queryForRecentDashboards(): Promise<DashboardSearchHit[]> {
|
|
const dashIds: number[] = _.take(impressionSrv.getDashboardOpened(), 30);
|
|
if (dashIds.length === 0) {
|
|
return Promise.resolve([]);
|
|
}
|
|
|
|
return backendSrv.search({ dashboardIds: dashIds }).then(result => {
|
|
return dashIds
|
|
.map(orderId => {
|
|
return _.find(result, { id: orderId });
|
|
})
|
|
.filter(hit => hit && !hit.isStarred);
|
|
});
|
|
}
|
|
|
|
private toggleRecent(section: Section) {
|
|
this.recentIsOpen = section.expanded = !section.expanded;
|
|
store.set('search.sections.recent', this.recentIsOpen);
|
|
|
|
if (!section.expanded || section.items.length) {
|
|
return Promise.resolve(section);
|
|
}
|
|
|
|
return this.queryForRecentDashboards().then(result => {
|
|
section.items = result;
|
|
return Promise.resolve(section);
|
|
});
|
|
}
|
|
|
|
private toggleStarred(section: Section) {
|
|
this.starredIsOpen = section.expanded = !section.expanded;
|
|
store.set('search.sections.starred', this.starredIsOpen);
|
|
return Promise.resolve(section);
|
|
}
|
|
|
|
private getStarred(sections: Sections) {
|
|
if (!contextSrv.isSignedIn) {
|
|
return Promise.resolve();
|
|
}
|
|
|
|
return backendSrv.search({ starred: true, limit: 30 }).then(result => {
|
|
if (result.length > 0) {
|
|
sections['starred'] = {
|
|
title: 'Starred',
|
|
icon: 'fa fa-star-o',
|
|
score: -2,
|
|
expanded: this.starredIsOpen,
|
|
toggle: this.toggleStarred.bind(this),
|
|
items: result,
|
|
};
|
|
}
|
|
});
|
|
}
|
|
|
|
search(options: any) {
|
|
const sections: any = {};
|
|
const promises = [];
|
|
const query = _.clone(options);
|
|
const hasFilters =
|
|
options.query ||
|
|
(options.tag && options.tag.length > 0) ||
|
|
options.starred ||
|
|
(options.folderIds && options.folderIds.length > 0);
|
|
|
|
if (!options.skipRecent && !hasFilters) {
|
|
promises.push(this.getRecentDashboards(sections));
|
|
}
|
|
|
|
if (!options.skipStarred && !hasFilters) {
|
|
promises.push(this.getStarred(sections));
|
|
}
|
|
|
|
query.folderIds = query.folderIds || [];
|
|
if (!hasFilters) {
|
|
query.folderIds = [0];
|
|
}
|
|
|
|
promises.push(
|
|
backendSrv.search(query).then(results => {
|
|
return this.handleSearchResult(sections, results);
|
|
})
|
|
);
|
|
|
|
return Promise.all(promises).then(() => {
|
|
return _.sortBy(_.values(sections), 'score');
|
|
});
|
|
}
|
|
|
|
private handleSearchResult(sections: Sections, results: DashboardSearchHit[]): any {
|
|
if (results.length === 0) {
|
|
return sections;
|
|
}
|
|
|
|
// create folder index
|
|
for (const hit of results) {
|
|
if (hit.type === 'dash-folder') {
|
|
sections[hit.id] = {
|
|
id: hit.id,
|
|
uid: hit.uid,
|
|
title: hit.title,
|
|
expanded: false,
|
|
items: [],
|
|
toggle: this.toggleFolder.bind(this),
|
|
url: hit.url,
|
|
icon: 'fa fa-folder',
|
|
score: _.keys(sections).length,
|
|
};
|
|
}
|
|
}
|
|
|
|
for (const hit of results) {
|
|
if (hit.type === 'dash-folder') {
|
|
continue;
|
|
}
|
|
|
|
let section = sections[hit.folderId || 0];
|
|
if (!section) {
|
|
if (hit.folderId) {
|
|
section = {
|
|
id: hit.folderId,
|
|
uid: hit.folderUid,
|
|
title: hit.folderTitle,
|
|
url: hit.folderUrl,
|
|
items: [],
|
|
icon: 'fa fa-folder-open',
|
|
toggle: this.toggleFolder.bind(this),
|
|
score: _.keys(sections).length,
|
|
};
|
|
} else {
|
|
section = {
|
|
id: 0,
|
|
title: 'General',
|
|
items: [],
|
|
icon: 'fa fa-folder-open',
|
|
toggle: this.toggleFolder.bind(this),
|
|
score: _.keys(sections).length,
|
|
};
|
|
}
|
|
// add section
|
|
sections[hit.folderId || 0] = section;
|
|
}
|
|
|
|
section.expanded = true;
|
|
section.items.push(hit);
|
|
}
|
|
}
|
|
|
|
private toggleFolder(section: Section) {
|
|
section.expanded = !section.expanded;
|
|
section.icon = section.expanded ? 'fa fa-folder-open' : 'fa fa-folder';
|
|
|
|
if (section.items.length) {
|
|
return Promise.resolve(section);
|
|
}
|
|
|
|
const query = {
|
|
folderIds: [section.id],
|
|
};
|
|
|
|
return backendSrv.search(query).then(results => {
|
|
section.items = results;
|
|
return Promise.resolve(section);
|
|
});
|
|
}
|
|
|
|
getDashboardTags() {
|
|
return backendSrv.get('/api/dashboards/tags');
|
|
}
|
|
}
|
|
|
|
coreModule.service('searchSrv', SearchSrv);
|