IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix: Clean up logging and remove unused css #10289

Browse Source
This commit is contained in:
Johannes Schill
2018-01-03 16:03:13 +01:00
parent c297a1c5a5
commit c62a6aa7df
3 changed files with 28 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
public/app/core/components/UserPicker/UserPicker.tsx
View File

@@ -1,7 +1,7 @@
import React, { Component } from "react";
import { debounce } from "lodash";
import Select from "react-select";
import UserPickerOption from "./UserPickerOption";
import React, { Component } from 'react';
import { debounce } from 'lodash';
import Select from 'react-select';
import UserPickerOption from './UserPickerOption';
export interface IProps {
backendSrv: any;
teamId: string;
@@ -34,21 +34,16 @@ class UserPicker extends Component<IProps, any> {
this.debouncedSearchUsers = debounce(this.searchUsers, 300, {
leading: true,
trailing: false
trailing: false,
});
this.state = {
multi: false,
isLoading: false
isLoading: false,
};
}
componentWillReceiveProps(nextProps) {
console.log("componentWillReceiveProps", nextProps);
}
handleChange(user) {
console.log("user", user);
this.addUser(user.id);
}
@@ -56,44 +51,37 @@ class UserPicker extends Component<IProps, any> {
this.setState(prevState => {
return {
...prevState,
isLoading: isLoading
isLoading: isLoading,
};
});
}
addUser(userId) {
this.toggleLoading(true);
this.backendSrv
.post(`/api/teams/${this.teamId}/members`, { userId: userId })
.then(() => {
this.refreshList(); // this.get() in the angular controller
this.toggleLoading(false);
// this.$scope.$broadcast('user-picker-reset'); // TODO?
});
this.backendSrv.post(`/api/teams/${this.teamId}/members`, { userId: userId }).then(() => {
this.refreshList();
this.toggleLoading(false);
});
}
searchUsers(query) {
this.toggleLoading(true);
return this.backendSrv
.get(`/api/users/search?perpage=10&page=1&query=${query}`)
.then(result => {
const users = result.users.map(user => {
return {
id: user.id,
label: `${user.login} - ${user.email}`,
avatarUrl: user.avatarUrl
};
});
this.toggleLoading(false);
return { options: users };
return this.backendSrv.get(`/api/users/search?perpage=10&page=1&query=${query}`).then(result => {
const users = result.users.map(user => {
return {
id: user.id,
label: `${user.login} - ${user.email}`,
avatarUrl: user.avatarUrl,
};
});
this.toggleLoading(false);
return { options: users };
});
}
render() {
const AsyncComponent = this.state.creatable
? Select.AsyncCreatable
: Select.Async;
const AsyncComponent = this.state.creatable ? Select.AsyncCreatable : Select.Async;
return (
<div className="user-picker">