Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/setting' into 'master'

Browse Source 
Hotfix/setting

See merge request theappsmith/internal-tools-client!255
This commit is contained in:
Abhinav Jha 2020-01-22 09:19:17 +00:00
commit e6e3d085e2
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/client/src/pages/common/CustomizedDropdown/OrgDropdownData.tsx
View File

@ -66,24 +66,24 @@ export const options = (
{
content: <Link to="/org/users">Members</Link>,
},
{
content: <Link to="/org/biling">Usage & Billing</Link>,
},
{
content: <Link to="/org/support">Support</Link>,
},
{
content: <DropdownComponent {...switchdropdown(orgs)} />,
shouldCloseDropdown: false,
},
{
content: "Switch To Personal Workspace",
onSelect: () =>
getOnSelectAction(DropdownOnSelectActions.DISPATCH, {
type: ReduxActionTypes.SWITCH_ORGANIZATION_INIT,
payload: { organizationId: currentOrg.id },
}),
},
// {
// content: <Link to="/org/biling">Usage & Billing</Link>,
// },
// {
// content: <Link to="/org/support">Support</Link>,
// },
// {
// content: <DropdownComponent {...switchdropdown(orgs)} />,
// shouldCloseDropdown: false,
// },
// {
// content: "Switch To Personal Workspace",
// onSelect: () =>
// getOnSelectAction(DropdownOnSelectActions.DISPATCH, {
// type: ReduxActionTypes.SWITCH_ORGANIZATION_INIT,
// payload: { organizationId: currentOrg.id },
// }),
// },
],
},
{
@ -98,14 +98,14 @@ export const options = (
),
active: false,
},
{
content: "Settings",
onSelect: () =>
getOnSelectAction(
DropdownOnSelectActions.REDIRECT,
"/org/settings",
),
},
// {
// content: "Settings",
// onSelect: () =>
// getOnSelectAction(
// DropdownOnSelectActions.REDIRECT,
// "/org/settings",
// ),
// },
{
content: "Sign Out",
onSelect: () =>

2
app/client/src/pages/organization/invite.tsx
View File

@ -5,7 +5,7 @@ export const Invite = () => {
// const handleInviteUsersSubmit = (values: InviteUsersFormValues) => {};
return (
<React.Fragment>
<h1>Invite Users</h1>
<h2>Invite Users</h2>
<InviteUsersForm />
</React.Fragment>
);

6
app/client/src/pages/organization/settings.tsx
View File

@ -28,7 +28,7 @@ export const OrgSettings = (props: PageProps) => {
return (
<React.Fragment>
<PageSectionHeader>
<h1>
<h2>
{props.org && (
<EditableText
defaultValue={props.org.name}
@ -36,11 +36,11 @@ export const OrgSettings = (props: PageProps) => {
onTextChanged={changeOrgName}
/>
)}
</h1>
</h2>
</PageSectionHeader>
<PageSectionDivider />
<PageSectionHeader>
<h1>Organization Users</h1>
<h2>Users</h2>
<Button
intent="primary"
text="Invite Users"