Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions armory-header-deck/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@
},
"dependencies": {
"@spinnaker/core": "0.24.1",
"@spinnaker/pluginsdk": "0.3.0",
"@spinnaker/pluginsdk-peerdeps": "0.16.0",
"@spinnaker/pluginsdk": "0.3.1",
"@spinnaker/pluginsdk-peerdeps": "0.18.0",
"@spinnaker/presentation": "0.3.0",
"@types/react-dom": "17.0.9",
"@uirouter/core": "6.0.4",
"@uirouter/react": "1.0.2",
"bootstrap": "5.0.2",
"bootstrap": "3.4.1",
"graphql": "15.5.1",
"lodash-es": "4.17.21",
"prop-types": "15.6.1",
"react": "16.14.0",
"react-bootstrap": "^2.0.0-beta.4",
"react-dom": "16.14.0",
"react-bootstrap": "^0.32.1",
"recoil": "^0.0.10",
"rxjs": "6.6.7"
},
Expand All @@ -41,7 +41,7 @@
"@rollup/plugin-typescript": "8.2.1",
"@rollup/plugin-url": "6.0.0",
"@spinnaker/eslint-plugin": "3.0.1",
"@types/react": "16.8.25",
"@types/react-bootstrap": "0.32.5",
"@typescript-eslint/eslint-plugin": "4.4.0",
"@typescript-eslint/parser": "4.4.0",
"bufferutil": "4.0.2",
Expand All @@ -58,7 +58,7 @@
"rollup-plugin-terser": "7.0.2",
"rollup-plugin-visualizer": "5.4.1",
"shx": "0.3.3",
"typescript": "4.3.0-dev.20210427",
"typescript": "^4.0.0",
"utf-8-validate": "5.0.3"
},
"files": [
Expand Down
10 changes: 2 additions & 8 deletions armory-header-deck/src/components/Header/ArmoryHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,13 @@ import { useCurrentStateAndParams, useSrefActive } from '@uirouter/react';
import React, { Fragment, useState } from 'react';
import { useEffect } from 'react';

import {
AuthenticationService,
CollapsibleSectionStateCache,
GlobalSearch,
HelpMenu,
SETTINGS,
UserMenu,
} from '@spinnaker/core';
import { AuthenticationService, CollapsibleSectionStateCache, GlobalSearch, SETTINGS, UserMenu } from '@spinnaker/core';
import { Icon } from '@spinnaker/presentation';

import { AtipoGlobalBanner } from '../AtipoBanner/AtipoGlobalBanner';
import { BannerGroup } from '../Banner/BannerGroup';
import { QuickSpinBanner } from '../QuickSpinBanner/QuickSpinBanner';
import { HelpMenu } from '../help/HelpMenu';
import { addChurnZeroScript, initializeChurnZero } from '../../utils/ChurnZero';

import './ArmoryHeader.css';
Expand Down
32 changes: 32 additions & 0 deletions armory-header-deck/src/components/help/HelpMenu.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.help-menu {
border: 0;

.dropdown-toggle,
.dropdown-toggle:active {
border: 0;
font-size: 14px;
font-weight: 200;
margin: 0;
border: 0;
background: transparent;
border-radius: 0;
color: var(--color-white);

.caret {
margin-left: 3px;
}
}

.dropdown.open {
.dropdown-toggle {
background-color: transparent;
text-decoration: none;
color: var(--color-white);
box-shadow: none;
}
}

.dropdown-menu {
border: 0;
}
}
108 changes: 108 additions & 0 deletions armory-header-deck/src/components/help/HelpMenu.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
import { SETTINGS } from '@spinnaker/core';
import { UISref } from '@uirouter/react';
import React from 'react';
import { Dropdown, Glyphicon, MenuItem } from 'react-bootstrap';



import './HelpMenu.less';

const DOCS_URL = 'https://spinnaker.io/docs';
const COMMUNITY_URL = 'https://spinnaker.io/community';

const Feedback = () =>
SETTINGS.feedback && SETTINGS.feedback.url ? (
<MenuItem href={SETTINGS.feedback.url} target="_blank">
<i className={SETTINGS.feedback.icon || 'fa fa-envelope'} />
&nbsp; {SETTINGS.feedback.text || 'Send feedback'}
</MenuItem>
) : null;

const AdditionalHelpLinks = () =>
SETTINGS.additionalHelpLinks && SETTINGS.additionalHelpLinks.length ? (
<>
{SETTINGS.additionalHelpLinks.map((helpLink, i) => (
<MenuItem href={helpLink.url} key={i} target="_blank">
{helpLink.icon ? (
<span>
<i className={helpLink.icon} /> &nbsp;
</span>
) : null}
{helpLink.text || `Additional Help`}
</MenuItem>
))}
</>
) : null;

const Version = () => {
if (!SETTINGS.version) {
return null;
}

const CHANGELOG_URL = SETTINGS.changelogUrl.replace(':version', SETTINGS.version.replaceAll('.','-'));

return (
<MenuItem href={CHANGELOG_URL} target="_blank">
Spinnaker {SETTINGS.version}
</MenuItem>
);
};

export const HelpMenu = () => {
return (
<li className="help-menu">
<Dropdown id="help-menu-dropdown" pullRight={true}>
<Dropdown.Toggle className="hidden-lg" noCaret={true}>
<Glyphicon glyph="question-sign" />
</Dropdown.Toggle>
<Dropdown.Menu>
<Feedback />
<AdditionalHelpLinks />
<MenuItem href={DOCS_URL} target="_blank">
Docs
</MenuItem>
<MenuItem divider={true} />
<MenuItem href={COMMUNITY_URL} target="_blank">
Community Resources
</MenuItem>
<Version />
{SETTINGS.feature.pagerDuty && (
<li role="presentation">
<UISref to="home.page">
<a className="clickable">
<span className="feedback-item-label">Send a Page</span>
</a>
</UISref>
</li>
)}
</Dropdown.Menu>
</Dropdown>

<Dropdown id="help-menu-dropdown-large" pullRight={true}>
<Dropdown.Toggle className="hidden-xs hidden-sm hidden-md" noCaret={true}>
<Glyphicon glyph="question-sign" /> Help
</Dropdown.Toggle>
<Dropdown.Menu>
<Feedback />
<AdditionalHelpLinks />
<MenuItem href={DOCS_URL} target="_blank">
Docs
</MenuItem>
<MenuItem href={COMMUNITY_URL} target="_blank">
Community Resources
</MenuItem>
<Version />
{SETTINGS.feature.pagerDuty && (
<li role="presentation">
<UISref to="home.page">
<a className="clickable">
<span className="feedback-item-label">Send a Page</span>
</a>
</UISref>
</li>
)}
</Dropdown.Menu>
</Dropdown>
</li>
);
};
Loading