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

OrgPicker: Fixes so organisations load (#33990)

Browse Source 
* OrgPicker: Fixes so organisations load

* Update public/app/core/components/Select/OrgPicker.tsx

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>

* Chore: updates after PR comments

Co-authored-by: Alex Khomenko <Clarity-89@users.noreply.github.com>
This commit is contained in:
Hugo Häggmark
2021-05-12 14:21:54 +02:00
committed by GitHub
parent baa5ceb4c0
commit c1be52bed0
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/core/components/Select/OrgPicker.tsx
View File

@@ -36,7 +36,7 @@ export class OrgPicker extends PureComponent<Props, State> {
} }
getOrgOptions = async (query: string): Promise<Array<SelectableValue<number>>> => { getOrgOptions = async (query: string): Promise<Array<SelectableValue<number>>> => {
if (!this.orgs) { if (!this.orgs?.length) {
await this.loadOrgs(); await this.loadOrgs();
} }
return this.orgs.map( return this.orgs.map(

22
public/app/features/admin/UserOrgs.tsx
View File

@@ -1,16 +1,6 @@
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import { css, cx } from '@emotion/css'; import { css, cx } from '@emotion/css';
import { import { Button, ConfirmButton, Field, HorizontalGroup, Modal, stylesFactory, Themeable, withTheme } from '@grafana/ui';
Button,
ConfirmButton,
Container,
Field,
HorizontalGroup,
Modal,
stylesFactory,
Themeable,
withTheme,
} from '@grafana/ui';
import { GrafanaTheme } from '@grafana/data'; import { GrafanaTheme } from '@grafana/data';
import { AccessControlAction, Organization, OrgRole, UserOrg } from 'app/types'; import { AccessControlAction, Organization, OrgRole, UserOrg } from 'app/types';
import { OrgPicker, OrgSelectItem } from 'app/core/components/Select/OrgPicker'; import { OrgPicker, OrgSelectItem } from 'app/core/components/Select/OrgPicker';
@@ -251,16 +241,16 @@ export class AddToOrgModal extends PureComponent<AddToOrgModalProps, AddToOrgMod
<Field label="Role"> <Field label="Role">
<OrgRolePicker value={role} onChange={this.onOrgRoleChange} /> <OrgRolePicker value={role} onChange={this.onOrgRoleChange} />
</Field> </Field>
<Container padding="md"> <Modal.ButtonRow>
<HorizontalGroup spacing="md" justify="center"> <HorizontalGroup spacing="md" justify="center">
<Button variant="secondary" fill="outline" onClick={this.onCancel}>
Cancel
</Button>
<Button variant="primary" onClick={this.onAddUserToOrg}> <Button variant="primary" onClick={this.onAddUserToOrg}>
Add to organization Add to organization
</Button> </Button>
<Button variant="secondary" onClick={this.onCancel}>
Cancel
</Button>
</HorizontalGroup> </HorizontalGroup>
</Container> </Modal.ButtonRow>
</Modal> </Modal>
); );
} }