From 2a6d7f66e2e0c2e712e14aebdff8c46f98e0570e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 25 Jan 2023 12:54:58 +0100 Subject: [PATCH] rename to getLookAndColorFromUserStatus --- src/Umbraco.Web.UI.Client/libs/utils/utils.test.ts | 4 ++-- src/Umbraco.Web.UI.Client/libs/utils/utils.ts | 2 +- .../grid/workspace-view-users-grid.element.ts | 4 ++-- .../status/user-table-status-column-layout.element.ts | 6 +++--- .../users/users/workspace/user-workspace.element.ts | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/libs/utils/utils.test.ts b/src/Umbraco.Web.UI.Client/libs/utils/utils.test.ts index 96f5ebe6bb..47950df551 100644 --- a/src/Umbraco.Web.UI.Client/libs/utils/utils.test.ts +++ b/src/Umbraco.Web.UI.Client/libs/utils/utils.test.ts @@ -1,6 +1,6 @@ import { expect } from '@open-wc/testing'; import { InterfaceColor, InterfaceLook } from '@umbraco-ui/uui-base/lib/types'; -import { getTagLookAndColor } from './utils'; +import { getLookAndColorFromUserStatus } from './utils'; import type { UserStatus } from '@umbraco-cms/models'; describe('UmbUserExtensions', () => { @@ -13,7 +13,7 @@ describe('UmbUserExtensions', () => { ]; testCases.forEach((testCase) => { - const { look, color } = getTagLookAndColor(testCase.status); + const { look, color } = getLookAndColorFromUserStatus(testCase.status); expect(look).to.equal(testCase.look); expect(color).to.equal(testCase.color); }); diff --git a/src/Umbraco.Web.UI.Client/libs/utils/utils.ts b/src/Umbraco.Web.UI.Client/libs/utils/utils.ts index 0404a708b7..15c6ed72c4 100644 --- a/src/Umbraco.Web.UI.Client/libs/utils/utils.ts +++ b/src/Umbraco.Web.UI.Client/libs/utils/utils.ts @@ -1,7 +1,7 @@ import { InterfaceColor, InterfaceLook } from '@umbraco-ui/uui-base/lib/types'; import type { UserStatus } from '@umbraco-cms/models'; -export const getTagLookAndColor = (status: UserStatus): { look: InterfaceLook; color: InterfaceColor } => { +export const getLookAndColorFromUserStatus = (status: UserStatus): { look: InterfaceLook; color: InterfaceColor } => { switch ((status || '').toLowerCase()) { case 'invited': case 'inactive': diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts index a7c3b4115c..c484e7ec8a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/list-view-layouts/grid/workspace-view-users-grid.element.ts @@ -5,7 +5,7 @@ import { repeat } from 'lit/directives/repeat.js'; import { ifDefined } from 'lit-html/directives/if-defined.js'; import type { UmbSectionViewUsersElement } from '../../section-view-users.element'; import { UmbUserGroupStore, UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../../../../../user-groups/user-group.store'; -import { getTagLookAndColor } from '@umbraco-cms/utils'; +import { getLookAndColorFromUserStatus } from '@umbraco-cms/utils'; import type { UserDetails, UserEntity, UserGroupEntity } from '@umbraco-cms/models'; import { UmbLitElement } from '@umbraco-cms/element'; @@ -111,7 +111,7 @@ export class UmbWorkspaceViewUsersGridElement extends UmbLitElement { private renderUserCard(user: UserDetails) { if (!this._usersContext) return; - const statusLook = getTagLookAndColor(user.status); + const statusLook = getLookAndColorFromUserStatus(user.status); return html` + look="${getLookAndColorFromUserStatus(this.value.status).look}" + color="${getLookAndColorFromUserStatus(this.value.status).color}"> ${this.value.status} ` : nothing}`; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts index cb7f0f9d33..7a469a6ed2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts @@ -11,7 +11,7 @@ import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../.. import type { UmbModalService } from '../../../../core/modal'; import type { UmbWorkspaceEntityElement } from '../../../shared/components/workspace/workspace-entity-element.interface'; import { UmbWorkspaceUserContext } from './user-workspace.context'; -import { getTagLookAndColor } from '@umbraco-cms/utils'; +import { getLookAndColorFromUserStatus } from '@umbraco-cms/utils'; import type { UserDetails } from '@umbraco-cms/models'; import '../../../shared/components/input-user-group/input-user-group.element'; @@ -286,7 +286,7 @@ export class UmbUserWorkspaceElement extends UmbLitElement implements UmbWorkspa private _renderRightColumn() { if (!this._user || !this._workspaceContext) return nothing; - const statusLook = getTagLookAndColor(this._user.status); + const statusLook = getLookAndColorFromUserStatus(this._user.status); return html`