Merge "Save only previewed suggestions"
diff --git a/polygerrit-ui/app/elements/admin/gr-group/gr-group.ts b/polygerrit-ui/app/elements/admin/gr-group/gr-group.ts
index 8ee7669..754a233 100644
--- a/polygerrit-ui/app/elements/admin/gr-group/gr-group.ts
+++ b/polygerrit-ui/app/elements/admin/gr-group/gr-group.ts
@@ -7,7 +7,7 @@
import '../../shared/gr-button/gr-button';
import '../../shared/gr-copy-clipboard/gr-copy-clipboard';
import '../../shared/gr-select/gr-select';
-import '../../shared/gr-textarea/gr-textarea';
+import '../../shared/gr-suggestion-textarea/gr-suggestion-textarea';
import {
AutocompleteSuggestion,
AutocompleteQuery,
@@ -222,7 +222,7 @@
</h3>
<fieldset>
<div>
- <gr-textarea
+ <gr-suggestion-textarea
class="description"
autocomplete="on"
rows="4"
@@ -230,7 +230,7 @@
?disabled=${this.computeGroupDisabled()}
.text=${this.groupConfig?.description ?? ''}
@text-changed=${this.handleDescriptionTextChanged}
- ></gr-textarea>
+ ></gr-suggestion-textarea>
</div>
<span class="value">
<gr-button
diff --git a/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.ts b/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.ts
index 256c6a9..5cf71f8 100644
--- a/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-group/gr-group_test.ts
@@ -97,14 +97,14 @@
<h3 class="heading-3">Description</h3>
<fieldset>
<div>
- <gr-textarea
+ <gr-suggestion-textarea
autocomplete="on"
class="description monospace"
disabled=""
monospace=""
rows="4"
>
- </gr-textarea>
+ </gr-suggestion-textarea>
</div>
<span class="value">
<gr-button
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
index 90277534..4e8841e 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo.ts
@@ -9,7 +9,7 @@
import '../../shared/gr-button/gr-button';
import '../../shared/gr-download-commands/gr-download-commands';
import '../../shared/gr-select/gr-select';
-import '../../shared/gr-textarea/gr-textarea';
+import '../../shared/gr-suggestion-textarea/gr-suggestion-textarea';
import '../gr-repo-plugin-config/gr-repo-plugin-config';
import {
ConfigInfo,
@@ -244,7 +244,7 @@
return html`
<h3 id="Description" class="heading-3">Description</h3>
<fieldset>
- <gr-textarea
+ <gr-suggestion-textarea
id="descriptionInput"
class="description"
autocomplete="on"
@@ -254,7 +254,7 @@
?disabled=${this.readOnly}
.text=${this.repoConfig.description ?? ''}
@text-changed=${this.handleDescriptionTextChanged}
- ></gr-textarea>
+ ></gr-suggestion-textarea>
</fieldset>
`;
}
diff --git a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
index 4deb99a..0d30933 100644
--- a/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
+++ b/polygerrit-ui/app/elements/admin/gr-repo/gr-repo_test.ts
@@ -42,7 +42,7 @@
import {PageErrorEvent} from '../../../types/events';
import {GrButton} from '../../shared/gr-button/gr-button';
import {GrSelect} from '../../shared/gr-select/gr-select';
-import {GrTextarea} from '../../shared/gr-textarea/gr-textarea';
+import {GrSuggestionTextarea} from '../../shared/gr-suggestion-textarea/gr-suggestion-textarea';
import {IronInputElement} from '@polymer/iron-input/iron-input';
import {fixture, html, assert} from '@open-wc/testing';
@@ -199,7 +199,7 @@
<fieldset>
<h3 class="heading-3" id="Description">Description</h3>
<fieldset>
- <gr-textarea
+ <gr-suggestion-textarea
autocomplete="on"
class="description monospace"
disabled=""
@@ -208,7 +208,7 @@
placeholder="<Insert repo description here>"
rows="4"
>
- </gr-textarea>
+ </gr-suggestion-textarea>
</fieldset>
<h3 class="heading-3" id="Options">Repository Options</h3>
<fieldset id="options">
@@ -728,7 +728,7 @@
'#Title'
).classList.contains('edited')
);
- queryAndAssert<GrTextarea>(element, '#descriptionInput').text =
+ queryAndAssert<GrSuggestionTextarea>(element, '#descriptionInput').text =
configInputObj.description;
queryAndAssert<GrSelect>(element, '#stateSelect').bindValue =
configInputObj.state;
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
index bc01791..a4b4f13 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment.ts
@@ -10,7 +10,7 @@
import '../gr-dialog/gr-dialog';
import '../gr-formatted-text/gr-formatted-text';
import '../gr-icon/gr-icon';
-import '../gr-textarea/gr-textarea';
+import '../gr-suggestion-textarea/gr-suggestion-textarea';
import '../gr-tooltip-content/gr-tooltip-content';
import '../gr-confirm-delete-comment-dialog/gr-confirm-delete-comment-dialog';
import '../gr-account-label/gr-account-label';
@@ -20,7 +20,7 @@
import {css, html, LitElement, nothing, PropertyValues} from 'lit';
import {customElement, property, query, state} from 'lit/decorators.js';
import {provide, resolve} from '../../../models/dependency';
-import {GrTextarea} from '../gr-textarea/gr-textarea';
+import {GrSuggestionTextarea} from '../gr-suggestion-textarea/gr-suggestion-textarea';
import {
AccountDetailInfo,
DraftInfo,
@@ -143,7 +143,7 @@
*/
@query('#editTextarea')
- textarea?: GrTextarea;
+ textarea?: GrSuggestionTextarea;
@query('#container')
container?: HTMLElement;
@@ -864,7 +864,7 @@
private renderEditingTextarea() {
if (!this.editing || this.collapsed) return;
return html`
- <gr-textarea
+ <gr-suggestion-textarea
id="editTextarea"
class="editMessage"
autocomplete="on"
@@ -881,7 +881,7 @@
this.autoSaveTrigger$.next();
this.generateSuggestionTrigger$.next();
}}
- ></gr-textarea>
+ ></gr-suggestion-textarea>
`;
}
diff --git a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
index 08e5389..ef02c95 100644
--- a/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-comment/gr-comment_test.ts
@@ -406,7 +406,7 @@
</div>
</div>
<div class="body">
- <gr-textarea
+ <gr-suggestion-textarea
autocomplete="on"
class="code editMessage"
code=""
@@ -414,7 +414,7 @@
rows="4"
text="This is the test comment message."
>
- </gr-textarea>
+ </gr-suggestion-textarea>
<gr-endpoint-slot name="above-actions"></gr-endpoint-slot>
<div class="actions">
<div class="leftActions">
diff --git a/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts b/polygerrit-ui/app/elements/shared/gr-suggestion-textarea/gr-suggestion-textarea.ts
similarity index 98%
rename from polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts
rename to polygerrit-ui/app/elements/shared/gr-suggestion-textarea/gr-suggestion-textarea.ts
index 7f70911..78b7610 100644
--- a/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea.ts
+++ b/polygerrit-ui/app/elements/shared/gr-suggestion-textarea/gr-suggestion-textarea.ts
@@ -72,8 +72,8 @@
}
}
-@customElement('gr-textarea')
-export class GrTextarea extends LitElement {
+@customElement('gr-suggestion-textarea')
+export class GrSuggestionTextarea extends LitElement {
/**
* @event bind-value-changed
*/
@@ -669,6 +669,6 @@
declare global {
interface HTMLElementTagNameMap {
- 'gr-textarea': GrTextarea;
+ 'gr-suggestion-textarea': GrSuggestionTextarea;
}
}
diff --git a/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea_test.ts b/polygerrit-ui/app/elements/shared/gr-suggestion-textarea/gr-suggestion-textarea_test.ts
similarity index 96%
rename from polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea_test.ts
rename to polygerrit-ui/app/elements/shared/gr-suggestion-textarea/gr-suggestion-textarea_test.ts
index d84f5a7..e73f685 100644
--- a/polygerrit-ui/app/elements/shared/gr-textarea/gr-textarea_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-suggestion-textarea/gr-suggestion-textarea_test.ts
@@ -4,8 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
import '../../../test/common-test-setup';
-import './gr-textarea';
-import {GrTextarea} from './gr-textarea';
+import './gr-suggestion-textarea';
+import {GrSuggestionTextarea} from './gr-suggestion-textarea';
import {
Item,
ItemSelectedEventDetail,
@@ -20,11 +20,13 @@
import {createAccountWithEmail} from '../../../test/test-data-generators';
import {Key} from '../../../utils/dom-util';
-suite('gr-textarea tests', () => {
- let element: GrTextarea;
+suite('gr-suggestion-textarea tests', () => {
+ let element: GrSuggestionTextarea;
setup(async () => {
- element = await fixture<GrTextarea>(html`<gr-textarea></gr-textarea>`);
+ element = await fixture<GrSuggestionTextarea>(
+ html`<gr-suggestion-textarea></gr-suggestion-textarea>`
+ );
sinon.stub(element.reporting, 'reportInteraction');
await element.updateComplete;
});
@@ -706,12 +708,12 @@
});
});
- suite('gr-textarea monospace', () => {
- let element: GrTextarea;
+ suite('gr-suggestion-textarea monospace', () => {
+ let element: GrSuggestionTextarea;
setup(async () => {
- element = await fixture<GrTextarea>(
- html`<gr-textarea monospace></gr-textarea>`
+ element = await fixture<GrSuggestionTextarea>(
+ html`<gr-suggestion-textarea monospace></gr-suggestion-textarea>`
);
await element.updateComplete;
});
@@ -721,12 +723,12 @@
});
});
- suite('gr-textarea hideBorder', () => {
- let element: GrTextarea;
+ suite('gr-suggestion-textarea hideBorder', () => {
+ let element: GrSuggestionTextarea;
setup(async () => {
- element = await fixture<GrTextarea>(
- html`<gr-textarea hide-border></gr-textarea>`
+ element = await fixture<GrSuggestionTextarea>(
+ html`<gr-suggestion-textarea hide-border></gr-suggestion-textarea>`
);
await element.updateComplete;
});
