From 45fd3184135ba6cf7c7b27d0880f27c12822321a Mon Sep 17 00:00:00 2001 From: Stephen Salinas Date: Mon, 4 Apr 2022 10:08:26 -0400 Subject: [PATCH 1/4] Add costs plugin and fix overwhelming err message size --- .../singularity/config/UIConfiguration.java | 11 + .../hubspot/singularity/views/IndexView.java | 9 + SingularityUI/app/actions/api/base.es6 | 9 +- SingularityUI/app/actions/api/costs.es6 | 13 ++ SingularityUI/app/assets/index.mustache | 4 +- .../app/components/common/table/UITable.jsx | 2 +- .../components/requestDetail/CostsView.jsx | 66 ++++++ .../requestDetail/RequestDetailPage.jsx | 8 + .../header/RequestActionButtons.jsx | 1 - SingularityUI/app/reducers/api/index.es6 | 6 + SingularityUI/app/styles/stylus/main.styl | 4 + SingularityUI/gulpfile.js | 3 +- SingularityUI/package-lock.json | 203 ++++++++++++------ SingularityUI/pom.xml | 4 +- 14 files changed, 263 insertions(+), 80 deletions(-) create mode 100644 SingularityUI/app/actions/api/costs.es6 create mode 100644 SingularityUI/app/components/requestDetail/CostsView.jsx diff --git a/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java b/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java index f294b3d4ca..6f3f7b8509 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java @@ -117,6 +117,9 @@ public static RootUrlMode parse(String value) { @JsonProperty private Optional showRequestButtonsForGroup = Optional.empty(); + @JsonProperty + private Optional costsApiUrlFormat = Optional.empty(); + public boolean isHideNewDeployButton() { return hideNewDeployButton; } @@ -340,4 +343,12 @@ public Optional getShowRequestButtonsForGroup() { public void setShowRequestButtonsForGroup(Optional showRequestButtonsForGroup) { this.showRequestButtonsForGroup = showRequestButtonsForGroup; } + + public Optional getCostsApiUrlFormat() { + return costsApiUrlFormat; + } + + public void setCostsApiUrlFormat(Optional costsApiUrlFormat) { + this.costsApiUrlFormat = costsApiUrlFormat; + } } diff --git a/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java b/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java index 5ca1426ee3..5065f852e9 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java @@ -73,6 +73,7 @@ public class IndexView extends View { private final String appJsPath; private final String appCssPath; private final String vendorJsPath; + private final String costsApiUrlFormat; public IndexView( String singularityUriBase, @@ -190,6 +191,7 @@ public IndexView( } catch (IOException ioe) { throw new RuntimeException(ioe); } + this.costsApiUrlFormat = uiConfiguration.getCostsApiUrlFormat().orElse(""); } public String getAppRoot() { @@ -356,6 +358,10 @@ public String getShowRequestButtonsForGroup() { return showRequestButtonsForGroup; } + public String getCostsApiUrlFormat() { + return costsApiUrlFormat; + } + @Override public String toString() { return ( @@ -463,6 +469,9 @@ public String toString() { ", vendorJsPath='" + vendorJsPath + '\'' + + ", costsApiUrlFormat='" + + costsApiUrlFormat + + '\'' + "} " + super.toString() ); diff --git a/SingularityUI/app/actions/api/base.es6 b/SingularityUI/app/actions/api/base.es6 index 7985657c53..05fbc42f9c 100644 --- a/SingularityUI/app/actions/api/base.es6 +++ b/SingularityUI/app/actions/api/base.es6 @@ -40,7 +40,7 @@ export function buildApiAction(actionName, opts = {}, keyFunc = undefined) { window.location.href = config.redirectOnUnauthorizedUrl.replace('{URL}', encodeURIComponent(window.location.href)); } else { // Something else happened, display the error Messenger().post({ - message: `

An error occurred while accessing ${options.url}

${err}
`, + message: `

An error occurred while accessing ${options.url}

${err}
`, type: 'error' }); } @@ -82,13 +82,16 @@ export function buildApiAction(actionName, opts = {}, keyFunc = undefined) { options.headers.Authorization = Utils.getAuthTokenHeader(); } - return fetch(config.apiRoot + options.url + userParam, _.extend({credentials: 'include'}, _.omit(options, 'url'))) + const baseUrl = options.url.startsWith('https://') ? options.url : config.apiRoot + options.url; + + return fetch(baseUrl + userParam, _.extend({credentials: 'include'}, _.omit(options, 'url'))) .then(response => { apiResponse = response; if (response.status === 204) { return Promise.resolve(); } - if (response.headers.get('Content-Type') === 'application/json') { + const contentType = response.headers.get('Content-Type'); + if (contentType === 'application/json' || contentType === 'application/json;charset=utf-8') { // void response cannot be parsed as JSON if (response.headers.get('Content-Length') === '0') { return Promise.resolve(); diff --git a/SingularityUI/app/actions/api/costs.es6 b/SingularityUI/app/actions/api/costs.es6 new file mode 100644 index 0000000000..3eee70d4c3 --- /dev/null +++ b/SingularityUI/app/actions/api/costs.es6 @@ -0,0 +1,13 @@ +import { buildApiAction } from './base'; + +export const FetchCostData = buildApiAction( + 'FETCH_COSTS', + (requestId, costsUrlFormat) => { + const url = costsUrlFormat.replace('{REQUEST_ID}', requestId); + return ({ + url: url, + catchStatusCodes: [404] + }) + }, + (requestId) => requestId +); diff --git a/SingularityUI/app/assets/index.mustache b/SingularityUI/app/assets/index.mustache index 01a3573aa3..34be8dcbbe 100644 --- a/SingularityUI/app/assets/index.mustache +++ b/SingularityUI/app/assets/index.mustache @@ -55,7 +55,9 @@ quickLinks: {{{quickLinks}}}, navTitleLinks: {{{navTitleLinks}}}, lessTerminalPath: "{{{lessTerminalPath}}}", - showRequestButtonsForGroup: "{{{showRequestButtonsForGroup}}}" + showRequestButtonsForGroup: "{{{showRequestButtonsForGroup}}}", + costsApiUrlFormat: "{{{costsApiUrlFormat}}}" + }; diff --git a/SingularityUI/app/components/common/table/UITable.jsx b/SingularityUI/app/components/common/table/UITable.jsx index b27aa275ed..77d7ceb30b 100644 --- a/SingularityUI/app/components/common/table/UITable.jsx +++ b/SingularityUI/app/components/common/table/UITable.jsx @@ -187,7 +187,7 @@ class UITable extends Component { ); }); - if (sortDirection === UITable.SortDirection.ASC) { + if (sortDirection === UITable.SortDirection.DESC) { sorted.reverse(); } diff --git a/SingularityUI/app/components/requestDetail/CostsView.jsx b/SingularityUI/app/components/requestDetail/CostsView.jsx new file mode 100644 index 0000000000..82c46edf51 --- /dev/null +++ b/SingularityUI/app/components/requestDetail/CostsView.jsx @@ -0,0 +1,66 @@ +import React, { PropTypes } from 'react'; +import { connect } from 'react-redux'; + +import { Col } from 'react-bootstrap'; + +import CollapsableSection from '../common/CollapsableSection'; +import UITable from '../common/table/UITable'; +import Column from '../common/table/Column'; +import Utils from '../../utils'; + +const CostsView = ({requestId, costsAPI}) => { + const costs = costsAPI ? costsAPI.data : []; + const title = costs.length ? 'Average Daily Costs ($' + costs.map((c) => c.cost).reduce((p, c) => p + c).toFixed(4) + ')' : 'Average Daily Costs'; + return ( + + c.activityType + c.cost + c.costKey+ c.costType} + defaultSortBy={'cost'} + defaultSortDirection={'DESC'} + showPageLoaderWhenFetching={true} + isFetching={!costs.length} + > + Utils.humanizeText(c.activityType)} + /> + c.primaryKey} + /> + Utils.humanizeText(c.costType)} + /> + c.cost} + cellRender={(c) => '$' + c} + /> + + + ); +} + +CostsView.propTypes = { + requestId: PropTypes.string.isRequired, + costsAPI: PropTypes.object +}; + +const mapStateToProps = (state, ownProps) => ({ + costsAPI: Utils.maybe(state.api.costs, [ownProps.requestId]) +}); + +export default connect( + mapStateToProps +)(CostsView); \ No newline at end of file diff --git a/SingularityUI/app/components/requestDetail/RequestDetailPage.jsx b/SingularityUI/app/components/requestDetail/RequestDetailPage.jsx index 5b003e0aa9..88519acb29 100644 --- a/SingularityUI/app/components/requestDetail/RequestDetailPage.jsx +++ b/SingularityUI/app/components/requestDetail/RequestDetailPage.jsx @@ -4,6 +4,7 @@ import { withRouter } from 'react-router'; import rootComponent from '../../rootComponent'; import * as RefreshActions from '../../actions/ui/refresh'; +import { FetchCostData } from '../../actions/api/costs'; import { FetchRequest } from '../../actions/api/requests'; import { FetchActiveTasksForRequest, @@ -16,6 +17,7 @@ import { FetchTaskCleanups } from '../../actions/api/tasks'; +import CostsView from './CostsView'; import RequestHeader from './RequestHeader'; import RequestExpiringActions from './RequestExpiringActions'; import ActiveTasksTable from './ActiveTasksTable'; @@ -32,6 +34,10 @@ import { refresh, initialize } from '../../actions/ui/requestDetail'; class RequestDetailPage extends Component { componentDidMount() { this.props.refresh(); + if (config.costsApiUrlFormat) { + const { requestId } = this.props.params; + this.props.fetchCostsData(requestId); + } } componentWillReceiveProps(nextProps) { @@ -63,6 +69,7 @@ class RequestDetailPage extends Component { initialPageNumber={Number(taskHistoryPage) || 1} /> )} + {deleted || } {deleted || } {deleted || } @@ -108,6 +115,7 @@ const mapDispatchToProps = (dispatch, ownProps) => { cancelRefresh: () => dispatch( RefreshActions.CancelAutoRefresh(`RequestDetailPage-${ownProps.index}`) ), + fetchCostsData: (requestId) => dispatch(FetchCostData.trigger(requestId, config.costsApiUrlFormat)), fetchRequest: (requestId) => dispatch(FetchRequest.trigger(requestId, true)), fetchTaskCleanups: () => dispatch(FetchTaskCleanups.trigger()), fetchTaskHistoryForRequest: (requestId, count, page) => dispatch(FetchTaskHistoryForRequest.trigger(requestId, count, page)), diff --git a/SingularityUI/app/components/requestDetail/header/RequestActionButtons.jsx b/SingularityUI/app/components/requestDetail/header/RequestActionButtons.jsx index 61a8b7b444..85e1797c0d 100644 --- a/SingularityUI/app/components/requestDetail/header/RequestActionButtons.jsx +++ b/SingularityUI/app/components/requestDetail/header/RequestActionButtons.jsx @@ -241,7 +241,6 @@ RequestActionButtons.propTypes = { fetchRequest: PropTypes.func.isRequired, fetchActiveTasks: PropTypes.func.isRequired, router: PropTypes.shape({ push: PropTypes.func.isRequired }).isRequired, - admin: PropTypes.bool.isRequired, }; const mapStateToProps = (state, ownProps) => ({ diff --git a/SingularityUI/app/reducers/api/index.es6 b/SingularityUI/app/reducers/api/index.es6 index 29b25ecadd..667b7b9ec6 100644 --- a/SingularityUI/app/reducers/api/index.es6 +++ b/SingularityUI/app/reducers/api/index.es6 @@ -38,6 +38,10 @@ import { ReactivateRack } from '../../actions/api/racks'; +import { + FetchCostData + } from '../../actions/api/costs'; + import { FetchRequests, FetchRequestIds, @@ -116,6 +120,7 @@ const freezeRack = buildApiActionReducer(FreezeRack, []); const decommissionRack = buildApiActionReducer(DecommissionRack, []); const removeRack = buildApiActionReducer(RemoveRack, []); const reactivateRack = buildApiActionReducer(ReactivateRack, []); +const costs = buildKeyedApiActionReducer(FetchCostData, []); const request = buildKeyedApiActionReducer(FetchRequest); const requestIds = buildApiActionReducer(FetchRequestIds, []) const saveRequest = buildApiActionReducer(SaveRequest); @@ -175,6 +180,7 @@ export default combineReducers({ decommissionRack, removeRack, reactivateRack, + costs, request, saveRequest, removeRequest, diff --git a/SingularityUI/app/styles/stylus/main.styl b/SingularityUI/app/styles/stylus/main.styl index f1b884bc36..04b70b237c 100644 --- a/SingularityUI/app/styles/stylus/main.styl +++ b/SingularityUI/app/styles/stylus/main.styl @@ -118,3 +118,7 @@ code .tab-col padding-bottom 20px + +.err-message-content + max-height 250px + overflow scroll \ No newline at end of file diff --git a/SingularityUI/gulpfile.js b/SingularityUI/gulpfile.js index c0cb4343e3..95065f38c9 100644 --- a/SingularityUI/gulpfile.js +++ b/SingularityUI/gulpfile.js @@ -50,7 +50,8 @@ var templateData = { quickLinks: process.env.SINGULARITY_QUICK_LINKS || '{}', navTitleLinks: process.env.SINGULARITY_NAV_TITLE_LINKS || '{}', lessTerminalPath: process.env.SINGULARITY_LESS_TERMINAL_PATH || '', - showRequestButtonsForGroup: process.env.SINGULARITY_SHOW_REQUEST_BUTTONS_FOR_GROUP || '' + showRequestButtonsForGroup: process.env.SINGULARITY_SHOW_REQUEST_BUTTONS_FOR_GROUP || '', + costsApiUrlFormat: process.env.SINGUALRITY_COSTS_API_URL_FORMAT || '' }; var dest = path.resolve(__dirname, 'dist'); diff --git a/SingularityUI/package-lock.json b/SingularityUI/package-lock.json index 3c3b017751..5f5331987d 100644 --- a/SingularityUI/package-lock.json +++ b/SingularityUI/package-lock.json @@ -5483,25 +5483,29 @@ "dependencies": { "abbrev": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true, "optional": true }, "ansi-regex": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true, "optional": true }, "aproba": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", "dev": true, "optional": true }, "are-we-there-yet": { "version": "1.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", + "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, "optional": true, "requires": { @@ -5511,13 +5515,15 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true, "optional": true }, "brace-expansion": { "version": "1.1.11", - "bundled": true, + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, "optional": true, "requires": { @@ -5527,37 +5533,43 @@ }, "chownr": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz", + "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==", "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true, "optional": true }, "concat-map": { "version": "0.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true, "optional": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true, "optional": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true, "optional": true }, "debug": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "optional": true, "requires": { @@ -5566,25 +5578,29 @@ }, "deep-extend": { "version": "0.6.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "dev": true, "optional": true }, "delegates": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true, "optional": true }, "detect-libc": { "version": "1.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", "dev": true, "optional": true }, "fs-minipass": { "version": "1.2.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz", + "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==", "dev": true, "optional": true, "requires": { @@ -5593,13 +5609,15 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true, "optional": true }, "gauge": { "version": "2.7.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "optional": true, "requires": { @@ -5615,7 +5633,8 @@ }, "glob": { "version": "7.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "optional": true, "requires": { @@ -5629,13 +5648,15 @@ }, "has-unicode": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", "dev": true, "optional": true }, "iconv-lite": { "version": "0.4.24", - "bundled": true, + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, "optional": true, "requires": { @@ -5644,7 +5665,8 @@ }, "ignore-walk": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", + "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", "dev": true, "optional": true, "requires": { @@ -5653,7 +5675,8 @@ }, "inflight": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "optional": true, "requires": { @@ -5663,19 +5686,22 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", "dev": true, "optional": true }, "ini": { "version": "1.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", "dev": true, "optional": true }, "is-fullwidth-code-point": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "optional": true, "requires": { @@ -5684,13 +5710,15 @@ }, "isarray": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", "dev": true, "optional": true }, "minimatch": { "version": "3.0.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "optional": true, "requires": { @@ -5699,13 +5727,15 @@ }, "minimist": { "version": "0.0.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", "dev": true, "optional": true }, "minipass": { "version": "2.3.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", + "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, "optional": true, "requires": { @@ -5715,7 +5745,8 @@ }, "minizlib": { "version": "1.2.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", + "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", "dev": true, "optional": true, "requires": { @@ -5724,7 +5755,8 @@ }, "mkdirp": { "version": "0.5.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, "optional": true, "requires": { @@ -5733,13 +5765,15 @@ }, "ms": { "version": "2.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", "dev": true, "optional": true }, "needle": { "version": "2.3.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz", + "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==", "dev": true, "optional": true, "requires": { @@ -5750,7 +5784,8 @@ }, "node-pre-gyp": { "version": "0.12.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz", + "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==", "dev": true, "optional": true, "requires": { @@ -5768,7 +5803,8 @@ }, "nopt": { "version": "4.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", + "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=", "dev": true, "optional": true, "requires": { @@ -5778,13 +5814,15 @@ }, "npm-bundled": { "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", + "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", "dev": true, "optional": true }, "npm-packlist": { "version": "1.4.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.1.tgz", + "integrity": "sha512-+TcdO7HJJ8peiiYhvPxsEDhF3PJFGUGRcFsGve3vxvxdcpO2Z4Z7rkosRM0kWj6LfbK/P0gu3dzk5RU1ffvFcw==", "dev": true, "optional": true, "requires": { @@ -5794,7 +5832,8 @@ }, "npmlog": { "version": "4.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "optional": true, "requires": { @@ -5806,19 +5845,22 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true, "optional": true }, "object-assign": { "version": "4.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", "dev": true, "optional": true }, "once": { "version": "1.4.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "optional": true, "requires": { @@ -5827,19 +5869,22 @@ }, "os-homedir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", "dev": true, "optional": true }, "os-tmpdir": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true, "optional": true }, "osenv": { "version": "0.1.5", - "bundled": true, + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz", + "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==", "dev": true, "optional": true, "requires": { @@ -5849,19 +5894,22 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true, "optional": true }, "process-nextick-args": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", "dev": true, "optional": true }, "rc": { "version": "1.2.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", + "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "dev": true, "optional": true, "requires": { @@ -5873,7 +5921,8 @@ "dependencies": { "minimist": { "version": "1.2.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", "dev": true, "optional": true } @@ -5881,7 +5930,8 @@ }, "readable-stream": { "version": "2.3.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "optional": true, "requires": { @@ -5896,7 +5946,8 @@ }, "rimraf": { "version": "2.6.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", "dev": true, "optional": true, "requires": { @@ -5905,43 +5956,50 @@ }, "safe-buffer": { "version": "5.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "optional": true }, "safer-buffer": { "version": "2.1.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true, "optional": true }, "sax": { "version": "1.2.4", - "bundled": true, + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true, "optional": true }, "semver": { "version": "5.7.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true, "optional": true }, "set-blocking": { "version": "2.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", "dev": true, "optional": true }, "signal-exit": { "version": "3.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true, "optional": true }, "string-width": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "optional": true, "requires": { @@ -5952,7 +6010,8 @@ }, "string_decoder": { "version": "1.1.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "optional": true, "requires": { @@ -5961,7 +6020,8 @@ }, "strip-ansi": { "version": "3.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "optional": true, "requires": { @@ -5970,13 +6030,15 @@ }, "strip-json-comments": { "version": "2.0.1", - "bundled": true, + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true, "optional": true }, "tar": { "version": "4.4.8", - "bundled": true, + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz", + "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==", "dev": true, "optional": true, "requires": { @@ -5991,13 +6053,15 @@ }, "util-deprecate": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true, "optional": true }, "wide-align": { "version": "1.1.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", + "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, "optional": true, "requires": { @@ -6006,13 +6070,15 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", "dev": true, "optional": true }, "yallist": { "version": "3.0.3", - "bundled": true, + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", "dev": true, "optional": true } @@ -10521,11 +10587,6 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/classnames/-/classnames-1.2.2.tgz", "integrity": "sha1-6WoqAiLYSSXdj62yBdZuEviI7fk=" - }, - "fuzzy": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz", - "integrity": "sha1-THbsL/CsGjap3M+aAN+GIweNTtg=" } } }, diff --git a/SingularityUI/pom.xml b/SingularityUI/pom.xml index 404183e0c9..7a6a7dd46b 100644 --- a/SingularityUI/pom.xml +++ b/SingularityUI/pom.xml @@ -11,8 +11,8 @@ SingularityUI - v8.9.3 - 5.5.1 + v17.7.2 + 8.5.2 From c285510ed6bf61bbb9527a628df440e7f41a6b5b Mon Sep 17 00:00:00 2001 From: Stephen Salinas Date: Mon, 4 Apr 2022 10:24:09 -0400 Subject: [PATCH 2/4] bump node/npm back a bit --- SingularityUI/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SingularityUI/pom.xml b/SingularityUI/pom.xml index 7a6a7dd46b..861b3e6730 100644 --- a/SingularityUI/pom.xml +++ b/SingularityUI/pom.xml @@ -11,8 +11,8 @@ SingularityUI - v17.7.2 - 8.5.2 + v10.24.1 + 6.14.12 From c66ec25db5a89c3b3c5a2a292083cdb9d0fe782b Mon Sep 17 00:00:00 2001 From: Stephen Salinas Date: Mon, 4 Apr 2022 11:50:52 -0400 Subject: [PATCH 3/4] Nav fixes --- .../singularity/config/UIConfiguration.java | 12 +++++ .../config/UINavLinkConfiguration.java | 46 +++++++++++++++++++ .../hubspot/singularity/views/IndexView.java | 2 +- .../app/components/common/Navigation.jsx | 30 ++++++++++-- 4 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java diff --git a/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java b/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java index 6f3f7b8509..1f2287ea35 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/config/UIConfiguration.java @@ -43,6 +43,9 @@ public static RootUrlMode parse(String value) { @JsonProperty private Optional navColor = Optional.empty(); + @JsonProperty + private List formattedNavLinks = Collections.emptyList(); + @JsonProperty private String baseUrl; @@ -109,6 +112,7 @@ public static RootUrlMode parse(String value) { // e.g. {"QA": "https://singularity-qa.my-paas.net", "Production": "https://singularity-prod.my-paas.net"} @JsonProperty + @Deprecated private Map navTitleLinks = Collections.emptyMap(); @JsonProperty @@ -351,4 +355,12 @@ public Optional getCostsApiUrlFormat() { public void setCostsApiUrlFormat(Optional costsApiUrlFormat) { this.costsApiUrlFormat = costsApiUrlFormat; } + + public List getFormattedNavLinks() { + return formattedNavLinks; + } + + public void setFormattedNavLinks(List formattedNavLinks) { + this.formattedNavLinks = formattedNavLinks; + } } diff --git a/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java b/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java new file mode 100644 index 0000000000..a88f2be470 --- /dev/null +++ b/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java @@ -0,0 +1,46 @@ +package com.hubspot.singularity.config; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import javax.annotation.Nullable; +import javax.validation.constraints.NotNull; + +@JsonIgnoreProperties(ignoreUnknown = true) +public class UINavLinkConfiguration { + private String title; + private String linkFormat; + private Boolean divider = false; + private String tooltip; + + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getLinkFormat() { + return linkFormat; + } + + public void setLinkFormat(String linkFormat) { + this.linkFormat = linkFormat; + } + + public Boolean getDivider() { + return divider; + } + + public void setDivider(Boolean divider) { + this.divider = divider; + } + + @Nullable + public String getTooltip() { + return tooltip; + } + + public void setTooltip(@Nullable String tooltip) { + this.tooltip = tooltip; + } +} diff --git a/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java b/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java index 5065f852e9..f6dda8751f 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/views/IndexView.java @@ -171,7 +171,7 @@ public IndexView( } try { - this.navTitleLinks = ow.writeValueAsString(uiConfiguration.getNavTitleLinks()); + this.navTitleLinks = ow.writeValueAsString(uiConfiguration.getFormattedNavLinks()); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/SingularityUI/app/components/common/Navigation.jsx b/SingularityUI/app/components/common/Navigation.jsx index f3bb17c9fd..84656d926d 100644 --- a/SingularityUI/app/components/common/Navigation.jsx +++ b/SingularityUI/app/components/common/Navigation.jsx @@ -6,6 +6,8 @@ import classnames from 'classnames'; import Utils from '../../utils'; import { Glyphicon } from 'react-bootstrap'; +import OverlayTrigger from 'react-bootstrap/lib/OverlayTrigger'; +import ToolTip from 'react-bootstrap/lib/Tooltip'; function handleSearchClick(event, toggleGlobalSearch) { event.preventDefault(); @@ -58,11 +60,29 @@ const Navigation = (props) => { {config.title}
    - {Object.keys(config.navTitleLinks).map((linkTitle, index) => -
  • - {linkTitle} -
    • - )} + {config.navTitleLinks.map((linkConfig, index) => { + if (linkConfig['divider']) { + return (
  • ); + } + let link = ({linkConfig['title']}); + if ('tooltip' in linkConfig) { + const tooltip = ( + + {linkConfig['tooltip']} + + ); + link = ( + + {link} + + ); + } + return ( +
  • + {link} +
    • + ); + })}
From bf44a389747a71739d8d5587860cfda5656bff3f Mon Sep 17 00:00:00 2001 From: Stephen Salinas Date: Mon, 4 Apr 2022 11:51:17 -0400 Subject: [PATCH 4/4] imports --- .../com/hubspot/singularity/config/UINavLinkConfiguration.java | 1 - 1 file changed, 1 deletion(-) diff --git a/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java b/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java index a88f2be470..bc0f88db43 100644 --- a/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java +++ b/SingularityService/src/main/java/com/hubspot/singularity/config/UINavLinkConfiguration.java @@ -2,7 +2,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.annotation.Nullable; -import javax.validation.constraints.NotNull; @JsonIgnoreProperties(ignoreUnknown = true) public class UINavLinkConfiguration {