yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into improvement/model-remapping

Browse Source
This commit is contained in:
Mads Rasmussen
2024-02-06 12:57:40 +01:00
parent c8210ccb64 2f035436f3
commit 5d00009022
7 changed files with 1103 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2187
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

4
src/Umbraco.Web.UI.Client/package.json
View File

@@ -140,8 +140,8 @@
"@openid/appauth": "^1.3.1",
"@types/dompurify": "^3.0.5",
"@types/uuid": "^9.0.8",
"@umbraco-ui/uui": "1.6.0-rc.3",
"@umbraco-ui/uui-css": "1.6.0-rc.3",
"@umbraco-ui/uui": "1.6.2",
"@umbraco-ui/uui-css": "1.6.0",
"dompurify": "^3.0.6",
"element-internals-polyfill": "^1.3.9",
"lit": "^2.8.0",

20
src/Umbraco.Web.UI.Client/src/packages/core/components/dropdown/dropdown.element.ts
View File

@@ -1,20 +1,12 @@
import type {
InterfaceColor,
InterfaceLook,
UUIInterfaceColor,
UUIInterfaceLook,
PopoverContainerPlacement,
UUIPopoverContainerElement,
} from '@umbraco-cms/backoffice/external/uui';
import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
import type {
PropertyValueMap} from '@umbraco-cms/backoffice/external/lit';
import {
css,
html,
customElement,
property,
query,
when,
} from '@umbraco-cms/backoffice/external/lit';
import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
import { css, html, customElement, property, query, when } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
// TODO: maybe move this to UI Library.
@@ -29,10 +21,10 @@ export class UmbDropdownElement extends UmbLitElement {
label = '';
@property()
look: InterfaceLook = 'default';
look: UUIInterfaceLook = 'default';
@property()
color: InterfaceColor = 'default';
color: UUIInterfaceColor = 'default';
@property()
placement: PopoverContainerPlacement = 'bottom-start';

6
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/workspace-action.model.ts
View File

@@ -1,5 +1,5 @@
import type { ConditionTypes } from '../conditions/types.js';
import type { InterfaceColor, InterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import type { ManifestElementAndApi, ManifestWithDynamicConditions } from '@umbraco-cms/backoffice/extension-api';
import type { UmbWorkspaceAction } from '@umbraco-cms/backoffice/workspace';
@@ -12,6 +12,6 @@ export interface ManifestWorkspaceAction
export interface MetaWorkspaceAction {
label?: string; //TODO: Use or implement additional label-key
look?: InterfaceLook;
color?: InterfaceColor;
look?: UUIInterfaceLook;
color?: UUIInterfaceColor;
}

8
src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-level-tag.element.ts
View File

@@ -1,10 +1,10 @@
import type { InterfaceColor, InterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import { css, html, LitElement, ifDefined, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import { html, LitElement, ifDefined, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import type { LogLevelModel } from '@umbraco-cms/backoffice/backend-api';
interface LevelMapStyles {
look?: InterfaceLook;
color?: InterfaceColor;
look?: UUIInterfaceLook;
color?: UUIInterfaceColor;
style?: string;
}

4
src/Umbraco.Web.UI.Client/src/packages/user/utils.test.ts
View File

@@ -1,11 +1,11 @@
import { expect } from '@open-wc/testing';
import { getDisplayStateFromUserStatus } from './utils.js';
import type { InterfaceColor, InterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import { UserStateModel } from '@umbraco-cms/backoffice/backend-api';
describe('UmbUserExtensions', () => {
it('returns correct look and color from a status string', () => {
const testCases: { status: UserStateModel; look: InterfaceLook; color: InterfaceColor }[] = [
const testCases: { status: UserStateModel; look: UUIInterfaceLook; color: UUIInterfaceColor }[] = [
{ status: UserStateModel.ACTIVE, look: 'primary', color: 'positive' },
{ status: UserStateModel.INACTIVE, look: 'primary', color: 'warning' },
{ status: UserStateModel.INVITED, look: 'primary', color: 'warning' },

6
src/Umbraco.Web.UI.Client/src/packages/user/utils.ts
View File

@@ -1,9 +1,9 @@
import type { InterfaceColor, InterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import type { UUIInterfaceColor, UUIInterfaceLook } from '@umbraco-cms/backoffice/external/uui';
import type { UserStateModel } from '@umbraco-cms/backoffice/backend-api';
interface UmbUserDisplayStatus {
look: InterfaceLook;
color: InterfaceColor;
look: UUIInterfaceLook;
color: UUIInterfaceColor;
key: string;
}