Skip to content

Commit

Permalink
feat(cc-orga-member-list): make use of the cc-notice instead of cc-error
Browse files Browse the repository at this point in the history
  • Loading branch information
Galimede committed Jul 3, 2023
1 parent 44af4b1 commit 0380c1b
Showing 1 changed file with 9 additions and 21 deletions.
30 changes: 9 additions & 21 deletions src/components/cc-orga-member-list/cc-orga-member-list.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import { i18n } from '../../lib/i18n.js';
import '../cc-block/cc-block.js';
import '../cc-block-section/cc-block-section.js';
import '../cc-orga-member-card/cc-orga-member-card.js';
import '../cc-notice/cc-notice.js';
import '../cc-input-text/cc-input-text.js';
import '../cc-loader/cc-loader.js';
import '../cc-button/cc-button.js';
import '../cc-badge/cc-badge.js';
import '../cc-error/cc-error.js';
import '../cc-select/cc-select.js';
import { linkStyles } from '../../templates/cc-link/cc-link.js';

Expand Down Expand Up @@ -365,9 +365,8 @@ export class CcOrgaMemberList extends LitElement {
${this.members.state === 'loaded' ? this._renderMemberList(this.members.value, this.members.identityFilter, this.members.mfaDisabledOnlyFilter) : ''}
<!-- TODO replace <cc-error> by <cc-notice> when ready -->
${this.members.state === 'error' ? html`
<cc-error>${i18n('cc-orga-member-list.error')}</cc-error>
<cc-notice intent="warning" message="${i18n('cc-orga-member-list.error')}"></cc-notice>
` : ''}
</cc-block-section>
Expand Down Expand Up @@ -499,11 +498,14 @@ export class CcOrgaMemberList extends LitElement {
</div>
<!-- a11y: we need the live region to be present within the DOM from the start and insert content dynamically inside it. -->
<div class="wrapper-leave-error" aria-live="polite" aria-atomic="true">
<!-- TODO replace the <p> with a <cc-notice> when it's ready -->
${this.members.dangerZoneState === 'error' ? html`
<div class="leave-error">
<p><strong>${i18n('cc-orga-member-list.leave.error-last-admin.heading')}</strong></p>
<p>${i18n('cc-orga-member-list.leave.error-last-admin.text')}</p>
<div>
<cc-notice
intent="danger"
heading="${i18n('cc-orga-member-list.leave.error-last-admin.heading')}"
message="${i18n('cc-orga-member-list.leave.error-last-admin.text')}"
no-icon
></cc-notice>
</div>
` : ''}
</div>
Expand Down Expand Up @@ -630,20 +632,6 @@ export class CcOrgaMemberList extends LitElement {
display: flex;
justify-content: end;
}
.leave-error {
display: flex;
flex-direction: column;
padding: 0.5em 1em;
border: 1px solid var(--cc-color-border-danger-weak);
background-color: var(--cc-color-bg-danger-weaker);
border-radius: 0.4em;
gap: 0.5em;
}
.wrapper-leave-error p {
margin: 0;
}
/* endregion */
`,
];
Expand Down

0 comments on commit 0380c1b

Please sign in to comment.