Spearhead/joyent-portal
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(navigation): hide/show account depending on data

Browse Source
This commit is contained in:
Sérgio Ramos 2018-03-26 20:34:42 +01:00
parent b51f135703
commit 281f9ef60e
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/my-joy-navigation/package.json
View File

@ -1,6 +1,6 @@
{
"name": "my-joy-navigation",
"version": "2.3.3",
"version": "2.4.0",
"private": true,
"license": "MPL-2.0",
"main": "lib/index.js",

78
packages/my-joy-navigation/src/header.js
View File

@ -33,20 +33,19 @@ const GetHeader = gql`
}
`;
// Needs to be revised
// const GetAccount = gql`
// {
// datacenter {
// name
// }
// account {
// login
// }
// }
// `;
const GetAccount = gql`
{
datacenter {
name
}
account {
login
}
}
`;
const Navigation = ({
login,
account = {},
datacenter = true,
toggleSectionOpen,
isOpen,
@ -86,17 +85,18 @@ const Navigation = ({
</HeaderItem>
) : null}
{datacenter ? <HeaderDividerItem /> : null}
<HeaderItem>
<HeaderItemContent>
<HeaderItemSubContent>Account:</HeaderItemSubContent>
<HeaderSpace />
Raul Millais
</HeaderItemContent>
<HeaderItemIcon>
<Avatar />
</HeaderItemIcon>
</HeaderItem>
)
{account.login ? (
<HeaderItem>
<HeaderItemContent>
<HeaderItemSubContent>Account:</HeaderItemSubContent>
<HeaderSpace />
{`${account.login}`}
</HeaderItemContent>
<HeaderItemIcon>
<Avatar />
</HeaderItemIcon>
</HeaderItem>
) : null}
</HeaderRow>
{keys(Overlays).map(panelName =>
React.createElement(Overlays[panelName], {
@ -107,23 +107,23 @@ const Navigation = ({
);
export default compose(
// graphql(GetAccount, {
// options: () => ({
// ssr: false
// }),
// props: ({ data }) => {
// const {
// account = {},
// datacenter = {},
// loading = false,
// error = null
// } = data;
// const { login } = account;
// const { name } = datacenter;
graphql(GetAccount, {
options: () => ({
ssr: false
}),
props: ({ data }) => {
const {
account = {},
datacenter = {},
loading = false,
error = null
} = data;
// return { login, datacenter: name, loading, error };
// }
// }),
const { name } = datacenter;
return { account, datacenter: name, loading, error };
}
}),
graphql(GetHeader, {
options: () => ({
ssr: false