Fix template problems with gr-account-label
Change-Id: I06887e2f256ba91a51504a8f08101315019191a4
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 7d6386d..fcf1cf4 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -121,7 +121,6 @@
"elements/gr-app-element_html.ts",
"elements/settings/gr-settings-view/gr-settings-view_html.ts",
"elements/settings/gr-watched-projects-editor/gr-watched-projects-editor_html.ts",
- "elements/shared/gr-account-label/gr-account-label_html.ts",
"elements/shared/gr-account-list/gr-account-list_html.ts",
"elements/shared/gr-autocomplete/gr-autocomplete_html.ts",
"elements/shared/gr-change-status/gr-change-status_html.ts",
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
index d7078ed..cc66734 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label.ts
@@ -190,11 +190,7 @@
: '';
}
- _computeName(
- account?: AccountInfo,
- config?: ServerInfo,
- firstName?: boolean
- ) {
+ _computeName(account: AccountInfo, firstName: boolean, config?: ServerInfo) {
return getDisplayName(config, account, firstName);
}
@@ -264,12 +260,12 @@
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
- selfAccount: AccountInfo,
- selected: boolean
+ selected: boolean,
+ selfAccount?: AccountInfo
) {
if (selected) return true;
return (
- this._hasUnforcedAttention(highlight, account, change) &&
+ !!this._hasUnforcedAttention(highlight, account, change) &&
(isInvolved(change, selfAccount) || isSelf(account, selfAccount))
);
}
@@ -278,16 +274,16 @@
highlight: boolean,
account: AccountInfo,
change: ChangeInfo,
- selfAccount: AccountInfo,
force: boolean,
- selected: boolean
+ selected: boolean,
+ selfAccount?: AccountInfo
) {
const enabled = this._computeAttentionButtonEnabled(
highlight,
account,
change,
- selfAccount,
- selected
+ selected,
+ selfAccount
);
return enabled
? 'Click to remove the user from the attention set'
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts
index 03178c7..352763b 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_html.ts
@@ -111,9 +111,9 @@
link=""
aria-label="Remove user from attention set"
on-click="_handleRemoveAttentionClick"
- disabled="[[!_computeAttentionButtonEnabled(highlightAttention, account, change, _selfAccount, selected)]]"
- has-tooltip="[[_computeAttentionButtonEnabled(highlightAttention, account, change, _selfAccount, false)]]"
- title="[[_computeAttentionIconTitle(highlightAttention, account, change, _selfAccount, forceAttention, selected)]]"
+ disabled="[[!_computeAttentionButtonEnabled(highlightAttention, account, change, selected, _selfAccount)]]"
+ has-tooltip="[[_computeAttentionButtonEnabled(highlightAttention, account, change, false, _selfAccount)]]"
+ title="[[_computeAttentionIconTitle(highlightAttention, account, change, forceAttention, selected, _selfAccount)]]"
><iron-icon class="attention" icon="gr-icons:attention"></iron-icon>
</gr-button>
</template>
@@ -126,7 +126,7 @@
<gr-avatar account="[[account]]" imageSize="32"></gr-avatar>
</template>
<span class="text" part="gr-account-label-text">
- <span class="name">[[_computeName(account, _config, firstName)]]</span>
+ <span class="name">[[_computeName(account, firstName, _config)]]</span>
<template is="dom-if" if="[[!hideStatus]]">
<template is="dom-if" if="[[account.status]]">
<iron-icon class="status" icon="gr-icons:calendar"></iron-icon>
diff --git a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.ts b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.ts
index efaa9f7..574e450 100644
--- a/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-account-label/gr-account-label_test.ts
@@ -55,12 +55,12 @@
suite('_computeName', () => {
test('not showing anonymous', () => {
const account = {name: 'Wyatt'};
- assert.deepEqual(element._computeName(account), 'Wyatt');
+ assert.deepEqual(element._computeName(account, false), 'Wyatt');
});
test('showing anonymous but no config', () => {
const account = {};
- assert.deepEqual(element._computeName(account), 'Anonymous');
+ assert.deepEqual(element._computeName(account, false), 'Anonymous');
});
test('test for Anonymous Coward user and replace with Anonymous', () => {
@@ -71,7 +71,10 @@
},
};
const account = {};
- assert.deepEqual(element._computeName(account, config), 'Anonymous');
+ assert.deepEqual(
+ element._computeName(account, false, config),
+ 'Anonymous'
+ );
});
test('test for anonymous_coward_name', () => {
@@ -82,7 +85,10 @@
},
};
const account = {};
- assert.deepEqual(element._computeName(account, config), 'TestAnon');
+ assert.deepEqual(
+ element._computeName(account, false, config),
+ 'TestAnon'
+ );
});
});
