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 after merge from master

Browse Source
This commit is contained in:
Peter Holmberg
2018-10-02 13:19:11 +02:00
parent 09b681326e
commit 6d6416c04d
10 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/app/types/index.ts
View File

@@ -6,10 +6,9 @@ import { FolderDTO, FolderState, FolderInfo } from './folders';
import { DashboardState } from './dashboard';
import { DashboardAcl, OrgRole, PermissionLevel } from './acl';
import { ApiKey, ApiKeysState, NewApiKey } from './apiKeys';
import { User } from './user';
import { Invitee, OrgUser, User, UsersState } from './user';
import { DataSource, DataSourcesState } from './datasources';
import { PluginMeta, Plugin, PluginsState } from './plugins';
import { Invitee, User, UsersState } from './users';
export {
Team,
@@ -39,11 +38,11 @@ export {
ApiKey,
ApiKeysState,
NewApiKey,
User,
Plugin,
PluginsState,
DataSourcesState,
Invitee,
OrgUser,
User,
UsersState,
};

40
public/app/types/user.ts
View File

@@ -1,6 +1,44 @@
export interface User {
export interface OrgUser {
avatarUrl: string;
email: string;
lastSeenAt: string;
lastSeenAtAge: string;
login: string;
orgId: number;
role: string;
userId: number;
}
export interface User {
id: number;
label: string;
avatarUrl: string;
login: string;
}
export interface Invitee {
code: string;
createdOn: string;
email: string;
emailSent: boolean;
emailSentOn: string;
id: number;
invitedByEmail: string;
invitedByLogin: string;
invitedByName: string;
name: string;
orgId: number;
role: string;
status: string;
url: string;
}
export interface UsersState {
users: OrgUser[];
invitees: Invitee[];
searchQuery: string;
canInvite: boolean;
externalUserMngLinkUrl: string;
externalUserMngLinkName: string;
externalUserMngInfo: string;
}