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

update field names

Browse Source
This commit is contained in:
Mads Rasmussen
2024-05-02 18:44:34 +02:00
parent c5076b1ebe
commit 702cd619e4
8 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/mocks/data/data-type/data-type.data.ts
View File

@@ -14,6 +14,7 @@ export const data: Array<UmbMockDataTypeModel> = [
isFolder: true,
hasChildren: false,
editorAlias: '',
editorUiAlias: '',
values: [],
isDeletable: true,
canIgnoreStartNodes: false,
@@ -25,6 +26,7 @@ export const data: Array<UmbMockDataTypeModel> = [
isFolder: true,
hasChildren: true,
editorAlias: '',
editorUiAlias: '',
values: [],
isDeletable: true,
canIgnoreStartNodes: false,

20
src/Umbraco.Web.UI.Client/src/mocks/data/user/user.data.ts
View File

@@ -11,9 +11,9 @@ export const data: Array<UmbMockUserModel> = [
{
id: 'bca6c733-a63d-4353-a271-9a8b6bcca8bd',
documentStartNodeIds: [],
documentRootAccess: true,
hasDocumentRootAccess: true,
mediaStartNodeIds: [],
mediaRootAccess: true,
hasMediaRootAccess: true,
name: 'Umbraco User',
email: 'noreply@umbraco.com',
languageIsoCode: 'en-us',
@@ -32,9 +32,9 @@ export const data: Array<UmbMockUserModel> = [
{
id: '82e11d3d-b91d-43c9-9071-34d28e62e81d',
documentStartNodeIds: ['simple-document-id'],
documentRootAccess: true,
hasDocumentRootAccess: true,
mediaStartNodeIds: ['f2f81a40-c989-4b6b-84e2-057cecd3adc1'],
mediaRootAccess: true,
hasMediaRootAccess: true,
name: 'Amelie Walker',
email: 'awalker1@domain.com',
languageIsoCode: 'da-dk',
@@ -54,8 +54,8 @@ export const data: Array<UmbMockUserModel> = [
id: 'aa1d83a9-bc7f-47d2-b288-58d8a31f5017',
documentStartNodeIds: [],
mediaStartNodeIds: [],
documentRootAccess: true,
mediaRootAccess: true,
hasDocumentRootAccess: true,
hasMediaRootAccess: true,
name: 'Oliver Kim',
email: 'okim1@domain.com',
languageIsoCode: 'da-dk',
@@ -75,8 +75,8 @@ export const data: Array<UmbMockUserModel> = [
id: 'ff2f4a50-d3d4-4bc4-869d-c7948c160e54',
documentStartNodeIds: [],
mediaStartNodeIds: [],
documentRootAccess: true,
mediaRootAccess: true,
hasDocumentRootAccess: true,
hasMediaRootAccess: true,
name: 'Eliana Nieves',
email: 'enieves1@domain.com',
languageIsoCode: 'en-us',
@@ -96,8 +96,8 @@ export const data: Array<UmbMockUserModel> = [
id: 'c290c6d9-9f12-4838-8567-621b52a178de',
documentStartNodeIds: [],
mediaStartNodeIds: [],
documentRootAccess: true,
mediaRootAccess: true,
hasDocumentRootAccess: true,
hasMediaRootAccess: true,
name: 'Jasmine Patel',
email: 'jpatel1@domain.com',
languageIsoCode: 'en-us',

12
src/Umbraco.Web.UI.Client/src/mocks/data/user/user.db.ts
View File

@@ -68,8 +68,8 @@ class UmbUserMockDB extends UmbEntityMockDbBase<UmbMockUserModel> {
languages: [],
documentStartNodeIds: firstUser.documentStartNodeIds,
mediaStartNodeIds: firstUser.mediaStartNodeIds,
documentRootAccess: firstUser.documentRootAccess,
mediaRootAccess: firstUser.mediaRootAccess,
hasDocumentRootAccess: firstUser.hasDocumentRootAccess,
hasMediaRootAccess: firstUser.hasMediaRootAccess,
fallbackPermissions: [],
permissions,
allowedSections,
@@ -199,8 +199,8 @@ const createMockMapper = (item: CreateUserRequestModel): UmbMockUserModel => {
languageIsoCode: null,
documentStartNodeIds: [],
mediaStartNodeIds: [],
documentRootAccess: false,
mediaRootAccess: false,
hasDocumentRootAccess: false,
hasMediaRootAccess: false,
avatarUrls: [],
state: UserStateModel.INACTIVE,
failedLoginAttempts: 0,
@@ -223,8 +223,8 @@ const detailResponseMapper = (item: UmbMockUserModel): UserResponseModel => {
languageIsoCode: item.languageIsoCode,
documentStartNodeIds: item.documentStartNodeIds,
mediaStartNodeIds: item.mediaStartNodeIds,
documentRootAccess: item.documentRootAccess,
mediaRootAccess: item.mediaRootAccess,
hasDocumentRootAccess: item.hasDocumentRootAccess,
hasMediaRootAccess: item.hasMediaRootAccess,
avatarUrls: item.avatarUrls,
state: item.state,
failedLoginAttempts: item.failedLoginAttempts,

4
src/Umbraco.Web.UI.Client/src/packages/user/user/collection/repository/user-collection.server.data-source.ts
View File

@@ -64,8 +64,8 @@ export class UmbUserCollectionServerDataSource implements UmbCollectionDataSourc
languageIsoCode: item.languageIsoCode || null,
documentStartNodeUniques: item.documentStartNodeIds,
mediaStartNodeUniques: item.mediaStartNodeIds,
documentRootAccess: item.documentRootAccess,
mediaRootAccess: item.mediaRootAccess,
hasDocumentRootAccess: item.hasDocumentRootAccess,
hasMediaRootAccess: item.hasMediaRootAccess,
avatarUrls: item.avatarUrls,
state: item.state,
failedLoginAttempts: item.failedLoginAttempts,

12
src/Umbraco.Web.UI.Client/src/packages/user/user/repository/detail/user-detail.server.data-source.ts
View File

@@ -35,7 +35,7 @@ export class UmbUserServerDataSource implements UmbDetailDataSource<UmbUserDetai
const data: UmbUserDetailModel = {
avatarUrls: [],
createDate: null,
documentRootAccess: false,
hasDocumentRootAccess: false,
documentStartNodeUniques: [],
email: '',
entityType: UMB_USER_ENTITY_TYPE,
@@ -45,7 +45,7 @@ export class UmbUserServerDataSource implements UmbDetailDataSource<UmbUserDetai
lastLockoutDate: null,
lastLoginDate: null,
lastPasswordChangeDate: null,
mediaRootAccess: false,
hasMediaRootAccess: false,
mediaStartNodeUniques: [],
name: '',
state: null,
@@ -77,7 +77,7 @@ export class UmbUserServerDataSource implements UmbDetailDataSource<UmbUserDetai
const user: UmbUserDetailModel = {
avatarUrls: data.avatarUrls,
createDate: data.createDate,
documentRootAccess: data.documentRootAccess,
hasDocumentRootAccess: data.hasDocumentRootAccess,
documentStartNodeUniques: data.documentStartNodeIds,
email: data.email,
entityType: UMB_USER_ENTITY_TYPE,
@@ -87,7 +87,7 @@ export class UmbUserServerDataSource implements UmbDetailDataSource<UmbUserDetai
lastLockoutDate: data.lastLockoutDate || null,
lastLoginDate: data.lastLoginDate || null,
lastPasswordChangeDate: data.lastPasswordChangeDate || null,
mediaRootAccess: data.mediaRootAccess,
hasMediaRootAccess: data.hasMediaRootAccess,
mediaStartNodeUniques: data.mediaStartNodeIds,
name: data.name,
state: data.state,
@@ -143,11 +143,11 @@ export class UmbUserServerDataSource implements UmbDetailDataSource<UmbUserDetai
// TODO: make data mapper to prevent errors
const requestBody: UpdateUserRequestModel = {
documentStartNodeIds: model.documentStartNodeUniques,
documentRootAccess: model.documentRootAccess,
email: model.email,
hasDocumentRootAccess: model.hasDocumentRootAccess,
hasMediaRootAccess: model.hasMediaRootAccess,
languageIsoCode: model.languageIsoCode || '',
mediaStartNodeIds: model.mediaStartNodeUniques,
mediaRootAccess: model.mediaRootAccess,
name: model.name,
userGroupIds: model.userGroupUniques,
userName: model.userName,

34
src/Umbraco.Web.UI.Client/src/packages/user/user/types.ts
View File

@@ -5,26 +5,26 @@ export type UmbUserStateEnum = UserStateModel;
export const UmbUserStateEnum = UserStateModel;
export interface UmbUserDetailModel {
entityType: UmbUserEntityType;
email: string;
userName: string;
name: string;
userGroupUniques: Array<string>;
unique: string;
languageIsoCode: string | null;
documentStartNodeUniques: Array<string>;
documentRootAccess: boolean;
mediaStartNodeUniques: Array<string>;
mediaRootAccess: boolean;
avatarUrls: Array<string>;
state: UmbUserStateEnum | null;
failedLoginAttempts: number;
createDate: string | null;
updateDate: string | null;
lastLoginDate: string | null;
lastLockoutDate: string | null;
lastPasswordChangeDate: string | null;
documentStartNodeUniques: Array<string>;
email: string;
entityType: UmbUserEntityType;
failedLoginAttempts: number;
hasDocumentRootAccess: boolean;
hasMediaRootAccess: boolean;
isAdmin: boolean;
languageIsoCode: string | null;
lastLockoutDate: string | null;
lastLoginDate: string | null;
lastPasswordChangeDate: string | null;
mediaStartNodeUniques: Array<string>;
name: string;
state: UmbUserStateEnum | null;
unique: string;
updateDate: string | null;
userGroupUniques: Array<string>;
userName: string;
}
export type UmbUserMfaProviderModel = UserTwoFactorProviderModel;

12
src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-assign-access/user-workspace-assign-access.element.ts
View File

@@ -18,13 +18,13 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
private _documentStartNodeUniques: UmbUserDetailModel['documentStartNodeUniques'] = [];
@state()
private _documentRootAccess: UmbUserDetailModel['documentRootAccess'] = false;
private _documentRootAccess: UmbUserDetailModel['hasDocumentRootAccess'] = false;
@state()
private _mediaStartNodeUniques: UmbUserDetailModel['documentStartNodeUniques'] = [];
@state()
private _mediaRootAccess: UmbUserDetailModel['mediaRootAccess'] = false;
private _mediaRootAccess: UmbUserDetailModel['hasMediaRootAccess'] = false;
#workspaceContext?: typeof UMB_USER_WORKSPACE_CONTEXT.TYPE;
@@ -41,7 +41,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
);
this.observe(
this.#workspaceContext.documentRootAccess,
this.#workspaceContext.hasDocumentRootAccess,
(value) => (this._documentRootAccess = value),
'_observeDocumentRootAccess',
);
@@ -53,7 +53,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
);
this.observe(
this.#workspaceContext.mediaRootAccess,
this.#workspaceContext.hasMediaRootAccess,
(value) => (this._mediaRootAccess = value),
'_observeMediaRootAccess',
);
@@ -78,7 +78,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
event.stopPropagation();
const target = event.target;
// TODO make contexts method
this.#workspaceContext?.updateProperty('documentRootAccess', target.checked);
this.#workspaceContext?.updateProperty('hasDocumentRootAccess', target.checked);
this.#workspaceContext?.updateProperty('documentStartNodeUniques', []);
}
@@ -94,7 +94,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
event.stopPropagation();
const target = event.target;
// TODO make contexts method
this.#workspaceContext?.updateProperty('mediaRootAccess', target.checked);
this.#workspaceContext?.updateProperty('hasMediaRootAccess', target.checked);
this.#workspaceContext?.updateProperty('mediaStartNodeUniques', []);
}

4
src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/user-workspace.context.ts
View File

@@ -27,9 +27,9 @@ export class UmbUserWorkspaceContext
readonly documentStartNodeUniques = this.#currentData.asObservablePart(
(data) => data?.documentStartNodeUniques || [],
);
readonly documentRootAccess = this.#currentData.asObservablePart((data) => data?.documentRootAccess || false);
readonly hasDocumentRootAccess = this.#currentData.asObservablePart((data) => data?.hasDocumentRootAccess || false);
readonly mediaStartNodeUniques = this.#currentData.asObservablePart((data) => data?.mediaStartNodeUniques || []);
readonly mediaRootAccess = this.#currentData.asObservablePart((data) => data?.mediaRootAccess || false);
readonly hasMediaRootAccess = this.#currentData.asObservablePart((data) => data?.hasMediaRootAccess || false);
readonly routes = new UmbWorkspaceRouteManager(this);