diff options
Diffstat (limited to 'polygerrit-ui/app')
11 files changed, 52 insertions, 3 deletions
diff --git a/polygerrit-ui/app/behaviors/gr-access-behavior/gr-access-behavior.html b/polygerrit-ui/app/behaviors/gr-access-behavior/gr-access-behavior.html index 0c75c44887..8161024f42 100644 --- a/polygerrit-ui/app/behaviors/gr-access-behavior/gr-access-behavior.html +++ b/polygerrit-ui/app/behaviors/gr-access-behavior/gr-access-behavior.html @@ -112,6 +112,10 @@ limitations under the License. id: 'removeReviewer', name: 'Remove Reviewer', }, + stage: { + id: 'stage', + name: 'QtStage', + }, submit: { id: 'submit', name: 'Submit', diff --git a/polygerrit-ui/app/behaviors/rest-client-behavior/rest-client-behavior.html b/polygerrit-ui/app/behaviors/rest-client-behavior/rest-client-behavior.html index 85bc6a194d..5d08eda65f 100644 --- a/polygerrit-ui/app/behaviors/rest-client-behavior/rest-client-behavior.html +++ b/polygerrit-ui/app/behaviors/rest-client-behavior/rest-client-behavior.html @@ -35,8 +35,11 @@ limitations under the License. ChangeStatus: { ABANDONED: 'ABANDONED', + DEFERRED: 'DEFERRED', + INTEGRATING: 'INTEGRATING', MERGED: 'MERGED', NEW: 'NEW', + STAGED: 'STAGED', }, // Must be kept in sync with the ListChangesOption enum and protobuf. @@ -145,6 +148,12 @@ limitations under the License. states.push('Merged'); } else if (change.status === this.ChangeStatus.ABANDONED) { states.push('Abandoned'); + } else if (change.status === this.ChangeStatus.DEFERRED) { + states.push('Deferred'); + } else if (change.status === this.ChangeStatus.INTEGRATING) { + states.push('Integrating'); + } else if (change.status === this.ChangeStatus.STAGED) { + states.push('Staged'); } else if (change.mergeable === false || (opt_options && opt_options.mergeable === false)) { // 'mergeable' prop may not always exist (@see Issue 6819) diff --git a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js index 02cf861afa..4532a04a5d 100644 --- a/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js +++ b/polygerrit-ui/app/elements/change/gr-change-view/gr-change-view.js @@ -1532,7 +1532,10 @@ // changes are obviously not mergeable, but the mergeability API will not // answer for abandoned changes. if (this._change.status === this.ChangeStatus.MERGED || - this._change.status === this.ChangeStatus.ABANDONED) { + this._change.status === this.ChangeStatus.STAGED || + this._change.status === this.ChangeStatus.INTEGRATING || + this._change.status === this.ChangeStatus.ABANDONED || + this._change.status === this.ChangeStatus.DEFERRED) { this._mergeable = false; return Promise.resolve(); } diff --git a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html index c607a9f899..75409951c6 100644 --- a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html +++ b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.html @@ -38,6 +38,7 @@ limitations under the License. } </style> <template is="dom-repeat" items="[[_labels]]" as="label"> + <gr-endpoint-decorator name$="[[_computeDecoratorName('review-label-scores-', label.name)]]"> <gr-label-score-row class$="[[_computeLabelAccessClass(label.name, permittedLabels)]]" label="[[label]]" @@ -45,6 +46,7 @@ limitations under the License. labels="[[change.labels]]" permitted-labels="[[permittedLabels]]" label-values="[[_labelValues]]"></gr-label-score-row> + </gr-endpoint-decorator> </template> <div class="mergedMessage" hidden$="[[!_changeIsMerged(change.status)]]"> diff --git a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js index dffba3e60d..912ccae080 100644 --- a/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js +++ b/polygerrit-ui/app/elements/change/gr-label-scores/gr-label-scores.js @@ -82,6 +82,10 @@ return null; }, + _computeDecoratorName(preString, name) { + return preString + name.toLowerCase(); + }, + _computeLabels(labelRecord, account) { // Polymer 2: check for undefined if ([labelRecord, account].some(arg => arg === undefined)) { diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html index d29858eedd..25823849a6 100644 --- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html +++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.html @@ -189,6 +189,7 @@ limitations under the License. <ul class="links"> <template is="dom-repeat" items="[[_links]]" as="linkGroup"> <li class$="[[_computeLinkGroupClass(linkGroup)]]"> + <gr-endpoint-decorator name$="[[_computeDecoratorName('header-dropdown-', linkGroup.title)]]"> <gr-dropdown link down-arrow @@ -198,6 +199,7 @@ limitations under the License. [[linkGroup.title]] </span> </gr-dropdown> + </gr-endpoint-decorator> </li> </template> </ul> diff --git a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js index 773ad68dc6..a02fc9a9ba 100644 --- a/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js +++ b/polygerrit-ui/app/elements/core/gr-main-header/gr-main-header.js @@ -179,6 +179,10 @@ return '//' + window.location.host + this.getBaseUrl() + path; }, + _computeDecoratorName(preString, name) { + return preString + name.toLowerCase(); + }, + _computeLinks(defaultLinks, userLinks, adminLinks, topMenus, docBaseUrl) { // Polymer 2: check for undefined if ([ diff --git a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.html b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.html index c8bf6c1236..533a4f4d34 100644 --- a/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.html +++ b/polygerrit-ui/app/elements/core/gr-navigation/gr-navigation.html @@ -151,12 +151,19 @@ limitations under the License. suffixForDashboard: 'limit:10', }, { + name: 'Integrating', + query: '(is:staged OR is:integrating) -is:ignored (-is:wip OR owner:self) ' + + '(owner:${user} OR reviewer:${user} OR assignee:${user} ' + + 'OR cc:${user})', + suffixForDashboard: 'limit:20', + }, + { name: 'Recently closed', // Closed changes where viewed user is owner, reviewer, or assignee. // Changes ignored by the viewing user are filtered out, and so are WIP // changes not owned by the viewing user (the one instance of // 'owner:self' is intentional and implements this logic). - query: 'is:closed -is:ignored (-is:wip OR owner:self) ' + + query: '(is:merged OR is:abandoned OR is:deferred) -is:ignored (-is:wip OR owner:self) ' + '(owner:${user} OR reviewer:${user} OR assignee:${user} ' + 'OR cc:${user})', suffixForDashboard: '-age:4w limit:10', diff --git a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js index 0030babe97..f2f7d6d5e8 100644 --- a/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js +++ b/polygerrit-ui/app/elements/core/gr-search-bar/gr-search-bar.js @@ -90,6 +90,8 @@ 'status:merged', 'status:open', 'status:reviewed', + 'status:integrating', + 'status:staged', 'topic:', 'tr:', ]; diff --git a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.html b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.html index 55623b36f0..d56c59242d 100644 --- a/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.html +++ b/polygerrit-ui/app/elements/shared/gr-change-status/gr-change-status.html @@ -38,6 +38,18 @@ limitations under the License. background-color: #afafaf; color: #afafaf; } + :host(.deferred) .chip { + background-color: #afafaf; + color: #afafaf; + } + :host(.integrating) .chip { + background-color: #999900; + color: #999900; + } + :host(.staged) .chip { + background-color: #cccc00; + color: #cccc00; + } :host(.wip) .chip { background-color: #8f756c; color: #8f756c; diff --git a/polygerrit-ui/app/styles/themes/dark-theme.html b/polygerrit-ui/app/styles/themes/dark-theme.html index 957cc25344..1e72e3d3fd 100644 --- a/polygerrit-ui/app/styles/themes/dark-theme.html +++ b/polygerrit-ui/app/styles/themes/dark-theme.html @@ -80,7 +80,7 @@ limitations under the License. /* header and footer */ --footer-background-color: #131416; --footer-border-top: 1px solid var(--border-color); - --header-background-color: #3c4043; + --header-background-color: rgb(53, 54, 55); --header-border-bottom: 1px solid var(--border-color); --header-padding: 0 var(--spacing-l); --header-text-color: var(--primary-text-color); |