-
Notifications
You must be signed in to change notification settings - Fork 202
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge changes from topic "motd" into stable-2.16
* changes: Document MessageOfTheDay extension Add UI element to display messages of the day Add MessageOfTheDay-entries to ServerInfo
- Loading branch information
Showing
10 changed files
with
271 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
java/com/google/gerrit/extensions/common/MessageOfTheDayInfo.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // Copyright (C) 2020 The Android Open Source Project | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.google.gerrit.extensions.common; | ||
|
|
||
| import java.util.Date; | ||
|
|
||
| /** REST API representation of a "message of the day". */ | ||
| public class MessageOfTheDayInfo { | ||
| /** The ID of the message. */ | ||
| public String id; | ||
| /** The date and time the message will be displayed again after being dismissed by the user. */ | ||
| public Date redisplay; | ||
| /** The message in HTML-format. */ | ||
| public String html; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| <!-- | ||
| @license | ||
| Copyright (C) 2020 The Android Open Source Project | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
| <link rel="import" href="../../../bower_components/polymer/polymer.html"> | ||
| <link rel="import" href="../../shared/gr-button/gr-button.html"> | ||
|
|
||
| <dom-module id="gr-message-header"> | ||
| <template> | ||
| <style include="shared-styles"> | ||
| #container { | ||
| background-color: lightyellow; | ||
| display: flex; | ||
| height: fit-content; | ||
| justify-content: space-between; | ||
| padding: 1em; | ||
| } | ||
| </style> | ||
| <div id="container" hidden$="[[_hidden]]"> | ||
| <div id="message"></div> | ||
| <gr-button id="dismissMessageBtn" | ||
| link | ||
| on-tap="_handleDismissMessage">Dismiss</gr-button> | ||
| </div> | ||
| <gr-rest-api-interface id="restAPI"></gr-rest-api-interface> | ||
| </template> | ||
| <script src="../../../scripts/util.js"></script> | ||
| <script src="gr-message-header.js"></script> | ||
| </dom-module> |
52 changes: 52 additions & 0 deletions
52
polygerrit-ui/app/elements/core/gr-message-header/gr-message-header.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| /** | ||
| * @license | ||
| * Copyright (C) 2020 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| (function() { | ||
| 'use strict'; | ||
|
|
||
| Polymer({ | ||
| is: 'gr-message-header', | ||
|
|
||
| properties: { | ||
| message: { | ||
| type: Object, | ||
| reflectToAttribute: true, | ||
| }, | ||
| _hidden: { | ||
| type: Boolean, | ||
| value: true, | ||
| }, | ||
| }, | ||
|
|
||
| attached() { | ||
| if (!this.message || !this.message.html) { | ||
| return; | ||
| } | ||
| this._isHidden(); | ||
| this.$.message.innerHTML = this.message.html; | ||
| }, | ||
|
|
||
| _handleDismissMessage() { | ||
| document.cookie = | ||
| `msg-${this.message.id}=1; expires=${this.message.redisplay}`; | ||
| this._hidden = true; | ||
| }, | ||
|
|
||
| _isHidden() { | ||
| this._hidden = window.util.getCookie(`msg-${this.message.id}`) === '1'; | ||
| }, | ||
| }); | ||
| })(); |
60 changes: 60 additions & 0 deletions
60
polygerrit-ui/app/elements/core/gr-message-header/gr-message-header_test.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| <!DOCTYPE html> | ||
| <!-- | ||
| @license | ||
| Copyright (C) 2020 The Android Open Source Project | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes"> | ||
| <title>gr-message-header</title> | ||
|
|
||
| <script src="../../../bower_components/webcomponentsjs/webcomponents-lite.min.js"></script> | ||
| <script src="../../../bower_components/web-component-tester/browser.js"></script> | ||
| <link rel="import" href="../../../test/common-test-setup.html"/> | ||
| <link rel="import" href="gr-message-header.html"> | ||
|
|
||
| <script>void(0);</script> | ||
|
|
||
| <test-fixture id="basic"> | ||
| <template> | ||
| <gr-message-header></gr-message-header> | ||
| </template> | ||
| </test-fixture> | ||
|
|
||
| <script> | ||
| suite('gr-message-header tests', () => { | ||
| let element; | ||
|
|
||
| setup(() => { | ||
| element = fixture('basic'); | ||
| }); | ||
|
|
||
| test('show message', () => { | ||
| element.message = {html: 'This is a test message.'}; | ||
| element.attached(); | ||
| assert.equal(element.$.message.innerHTML, element.message.html); | ||
| }); | ||
|
|
||
| test('hide message on dismiss', () => { | ||
| element.message = {html: 'This is a test message.', id: 'test'}; | ||
| element.attached(); | ||
| MockInteractions.tap(element.$.dismissMessageBtn); | ||
| assert.isTrue(element.$.container.hidden); | ||
| assert.isTrue(document.cookie.includes('msg-test=1')); | ||
|
|
||
| element.attached(); | ||
| assert.isTrue(element.$.container.hidden); | ||
| }); | ||
| }); | ||
| </script> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters