pigui/task-stream
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: public projects, project deletion and sagas

Browse Source 
Public projects:
- Project.isPublic (create/update, owners and admins). Anyone can read a
  public project without a token: project, board, tickets, comments,
  history, releases, activity, tracking and statistics, over GraphQL and
  REST. Writes stay for members (401 anonymous, 403 outsiders).
- @OptionalAuth() / @ApiOptionalPireonAuth(): anonymous callers allowed,
  invalid tokens still rejected. ReadAccess lets anonymous viewers read
  public projects only; linked tickets are filtered by visibility.
- publicProjects (GraphQL) and GET /api/explore/projects (REST).
- Web: «Explorar» page, project pages open without a session (read-only
  notice, sign-in hints), public badge, visibility switch in settings,
  no realtime subscriptions without a session.

Project deletion:
- Owner only, confirming the key (deleteProject / DELETE
  /api/projects/{project}?confirm=KEY). The key is freed; the read model
  drops the project and members are notified (web goes home).

Sagas (run by the EventsBridge after projections, durable and ordered):
- ProjectDeletionSaga: project deleted → delete its tickets and releases;
  ticket deleted → purge its comments and drop links from other tickets.
- ReleaseArchivedSaga: unfinished tickets leave an archived release.
- UserDeactivatedSaga: the Pireon webhook records UserDeactivatedEvent in
  the event store (EventRecorder); the tracker unassigns that user's open
  tickets as the system actor.
- Internal idempotent commands; domain refusals are logged and skipped,
  concurrency conflicts retried. Affected streams come from the event store
  (TrackerStreamsRepository).

Tests: domain lifecycle specs, saga specs run like the bridge, facade
tests, e2e for public access, cascade deletion, archived releases and
deactivation webhook. Docs, READMEs, schema.gql/openapi.json and Word/PDF
updated.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Josep Piguillem
2026-10-07 07:04:20 +02:00
parent 0e301ad545
commit e656222b54
164 changed files with 3862 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libs/web/tracker/infrastructure/src/lib/adapters/graphql-projects.gateway.ts
View File

@@ -8,17 +8,21 @@ import {
ProjectSettings,
ProjectsGateway,
ProjectStats,
UpdateProjectInput,
} from '@task-stream/web/tracker/domain';
import { map, Observable } from 'rxjs';
import {
AddProjectMemberDocument,
ChangeProjectMemberRoleDocument,
CreateProjectDocument,
DeleteProjectDocument,
MyProjectsDocument,
ProjectAnalyticsDocument,
ProjectDocument,
ProjectStatsDocument,
PublicProjectsDocument,
RemoveProjectMemberDocument,
UpdateProjectDocument,
UpdateProjectSettingsDocument,
} from '../graphql/generated';
import { GraphqlOperations } from './graphql-operations';
@@ -39,6 +43,12 @@ export class GraphqlProjectsGateway extends ProjectsGateway {
.pipe(map((d) => d.myProjects.map(toProject)));
}
publicProjects(): Observable<Project[]> {
return this.gql
.query(PublicProjectsDocument)
.pipe(map((d) => d.publicProjects.map(toProject)));
}
project(idOrKey: string): Observable<Project> {
return this.gql
.query(ProjectDocument, { idOrKey })
@@ -75,6 +85,18 @@ export class GraphqlProjectsGateway extends ProjectsGateway {
.pipe(map((d) => toCommandResult(d.createProject)));
}
update(input: UpdateProjectInput): Observable<CommandResult> {
return this.gql
.mutate(UpdateProjectDocument, { input })
.pipe(map((d) => toCommandResult(d.updateProject)));
}
delete(projectId: string, confirmKey: string): Observable<CommandResult> {
return this.gql
.mutate(DeleteProjectDocument, { projectId, confirmKey })
.pipe(map((d) => toCommandResult(d.deleteProject)));
}
addMember(input: MemberInput): Observable<CommandResult> {
return this.gql
.mutate(AddProjectMemberDocument, { input: input as never })

92
libs/web/tracker/infrastructure/src/lib/adapters/graphql-realtime.gateway.ts
View File

@@ -1,13 +1,14 @@
import { inject, Injectable } from '@angular/core';
import { AccessTokenSource } from '@task-stream/web/shared/infrastructure';
import {
Activity,
CommentChanged,
IssueChanged,
Project,
ProjectChanged,
Release,
TrackerRealtimeGateway,
} from '@task-stream/web/tracker/domain';
import { map, Observable } from 'rxjs';
import { defer, EMPTY, map, Observable, switchMap } from 'rxjs';
import {
ActivityAddedDocument,
CommentChangedDocument,
@@ -25,53 +26,84 @@ import {
toRelease,
} from './mappers';
/** GraphQL subscriptions (graphql-ws). Each stream lives while it is subscribed. */
/**
* GraphQL subscriptions (graphql-ws). Each stream lives while it is
* subscribed. The API only accepts signed-in sockets, so anonymous visitors
* of public projects get no live updates (instead of a socket retrying forever).
*/
@Injectable()
export class GraphqlRealtimeGateway extends TrackerRealtimeGateway {
private readonly gql = inject(GraphqlOperations);
private readonly tokens = inject(AccessTokenSource);
private signedIn<T>(stream: () => Observable<T>): Observable<T> {
return defer(() => this.tokens.accessToken()).pipe(
switchMap((token) => (token ? stream() : EMPTY)),
);
}
issueChanges(projectId: string): Observable<IssueChanged> {
return this.gql.subscribe(IssueChangedDocument, { projectId }).pipe(
map(({ issueChanged }) => ({
...issueChanged,
issue: toIssueSummary(issueChanged.issue),
})),
return this.signedIn(() =>
this.gql.subscribe(IssueChangedDocument, { projectId }).pipe(
map(({ issueChanged }) => ({
...issueChanged,
issue: toIssueSummary(issueChanged.issue),
})),
),
);
}
commentChanges(issueId: string): Observable<CommentChanged> {
return this.gql.subscribe(CommentChangedDocument, { issueId }).pipe(
map(({ commentChanged }) => ({
action: commentChanged.action,
commentId: commentChanged.commentId,
comment: commentChanged.comment
? toComment(commentChanged.comment)
: null,
})),
return this.signedIn(() =>
this.gql.subscribe(CommentChangedDocument, { issueId }).pipe(
map(({ commentChanged }) => ({
action: commentChanged.action,
commentId: commentChanged.commentId,
comment: commentChanged.comment
? toComment(commentChanged.comment)
: null,
})),
),
);
}
activity(projectId: string): Observable<Activity> {
return this.gql
.subscribe(ActivityAddedDocument, { projectId })
.pipe(map((d) => toActivity(d.activityAdded)));
return this.signedIn(() =>
this.gql
.subscribe(ActivityAddedDocument, { projectId })
.pipe(map((d) => toActivity(d.activityAdded))),
);
}
releaseChanges(projectId: string): Observable<Release> {
return this.gql
.subscribe(ReleaseChangedDocument, { projectId })
.pipe(map((d) => toRelease(d.releaseChanged.release)));
return this.signedIn(() =>
this.gql
.subscribe(ReleaseChangedDocument, { projectId })
.pipe(map((d) => toRelease(d.releaseChanged.release))),
);
}
projectChanges(projectId: string): Observable<Project> {
return this.gql
.subscribe(ProjectChangedDocument, { projectId })
.pipe(map((d) => toProject(d.projectChanged.project)));
projectChanges(projectId: string): Observable<ProjectChanged> {
return this.signedIn(() =>
this.gql
.subscribe(ProjectChangedDocument, { projectId })
.pipe(map((d) => toProjectChanged(d.projectChanged))),
);
}
myProjectsChanges(): Observable<Project> {
return this.gql
.subscribe(MyProjectsChangedDocument)
.pipe(map((d) => toProject(d.myProjectsChanged.project)));
myProjectsChanges(): Observable<ProjectChanged> {
return this.signedIn(() =>
this.gql
.subscribe(MyProjectsChangedDocument)
.pipe(map((d) => toProjectChanged(d.myProjectsChanged))),
);
}
}
const toProjectChanged = (change: {
action: string;
project: Parameters<typeof toProject>[0];
}): ProjectChanged => ({
project: toProject(change.project),
deleted: change.action === 'ProjectDeletedEvent',
});

1
libs/web/tracker/infrastructure/src/lib/graphql/fragments.graphql
View File

@@ -8,6 +8,7 @@ fragment ProjectFields on Project {
key
name
description
isPublic
updatedAt
version
owner {

415
libs/web/tracker/infrastructure/src/lib/graphql/generated.ts
View File

@@ -41,6 +41,8 @@ export type CreateIssueInput = {
export type CreateProjectInput = {
description?: string | null | undefined;
/** Readable by anyone, also without signing in */
isPublic?: boolean | null | undefined;
/** 2-10 chars, e.g. "TS" → tickets TS-1, TS-2... */
key: string;
name: string;
@@ -141,6 +143,13 @@ export type UpdateIssueInput = {
type?: string | null | undefined;
};
export type UpdateProjectInput = {
description?: string | null | undefined;
isPublic?: boolean | null | undefined;
name?: string | null | undefined;
projectId: string;
};
export type WorkflowStatusInput = {
archived?: boolean;
category: StatusCategory;
@@ -157,6 +166,7 @@ export type ProjectFieldsFragment = {
key: string;
name: string;
description: string | null;
isPublic: boolean;
updatedAt: string;
version: number;
owner: { id: string; name: string };
@@ -504,6 +514,7 @@ export type MyProjectsQuery = {
key: string;
name: string;
description: string | null;
isPublic: boolean;
updatedAt: string;
version: number;
owner: { id: string; name: string };
@@ -540,6 +551,7 @@ export type ProjectQuery = {
key: string;
name: string;
description: string | null;
isPublic: boolean;
updatedAt: string;
version: number;
owner: { id: string; name: string };
@@ -678,6 +690,58 @@ export type ProjectAnalyticsQuery = {
};
};
export type PublicProjectsQueryVariables = Exact<{ [key: string]: never }>;
export type PublicProjectsQuery = {
publicProjects: Array<{
id: string;
key: string;
name: string;
description: string | null;
isPublic: boolean;
updatedAt: string;
version: number;
owner: { id: string; name: string };
members: Array<{ role: ProjectRole; user: { id: string; name: string } }>;
settings: {
statuses: Array<{
id: string;
name: string;
category: StatusCategory;
color: string;
requiresReason: boolean;
archived: boolean;
}>;
transitions: Array<{ from: string; to: Array<string> }>;
issueTypes: Array<{
id: string;
name: string;
icon: string;
color: string;
archived: boolean;
}>;
areas: Array<{ id: string; name: string; archived: boolean }>;
};
}>;
};
export type UpdateProjectMutationVariables = Exact<{
input: UpdateProjectInput;
}>;
export type UpdateProjectMutation = {
updateProject: { id: string; key: string | null; version: number };
};
export type DeleteProjectMutationVariables = Exact<{
projectId: string;
confirmKey: string;
}>;
export type DeleteProjectMutation = {
deleteProject: { id: string; key: string | null; version: number };
};
export type ReleasesQueryVariables = Exact<{
idOrKey: string;
}>;
@@ -862,11 +926,13 @@ export type ProjectChangedSubscriptionVariables = Exact<{
export type ProjectChangedSubscription = {
projectChanged: {
action: string;
project: {
id: string;
key: string;
name: string;
description: string | null;
isPublic: boolean;
updatedAt: string;
version: number;
owner: { id: string; name: string };
@@ -900,11 +966,13 @@ export type MyProjectsChangedSubscriptionVariables = Exact<{
export type MyProjectsChangedSubscription = {
myProjectsChanged: {
action: string;
project: {
id: string;
key: string;
name: string;
description: string | null;
isPublic: boolean;
updatedAt: string;
version: number;
owner: { id: string; name: string };
@@ -969,6 +1037,7 @@ export const ProjectFieldsFragmentDoc = {
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'description' } },
{ kind: 'Field', name: { kind: 'Name', value: 'isPublic' } },
{ kind: 'Field', name: { kind: 'Name', value: 'updatedAt' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
{
@@ -3067,6 +3136,7 @@ export const MyProjectsDocument = {
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'description' } },
{ kind: 'Field', name: { kind: 'Name', value: 'isPublic' } },
{ kind: 'Field', name: { kind: 'Name', value: 'updatedAt' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
{
@@ -3267,6 +3337,7 @@ export const ProjectDocument = {
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'description' } },
{ kind: 'Field', name: { kind: 'Name', value: 'isPublic' } },
{ kind: 'Field', name: { kind: 'Name', value: 'updatedAt' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
{
@@ -4263,6 +4334,346 @@ export const ProjectAnalyticsDocument = {
ProjectAnalyticsQuery,
ProjectAnalyticsQueryVariables
>;
export const PublicProjectsDocument = {
kind: 'Document',
definitions: [
{
kind: 'OperationDefinition',
operation: 'query',
name: { kind: 'Name', value: 'PublicProjects' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'Field',
name: { kind: 'Name', value: 'publicProjects' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'FragmentSpread',
name: { kind: 'Name', value: 'ProjectFields' },
},
],
},
},
],
},
},
{
kind: 'FragmentDefinition',
name: { kind: 'Name', value: 'UserRefFields' },
typeCondition: {
kind: 'NamedType',
name: { kind: 'Name', value: 'UserRef' },
},
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
],
},
},
{
kind: 'FragmentDefinition',
name: { kind: 'Name', value: 'ProjectFields' },
typeCondition: {
kind: 'NamedType',
name: { kind: 'Name', value: 'Project' },
},
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'description' } },
{ kind: 'Field', name: { kind: 'Name', value: 'isPublic' } },
{ kind: 'Field', name: { kind: 'Name', value: 'updatedAt' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'owner' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'FragmentSpread',
name: { kind: 'Name', value: 'UserRefFields' },
},
],
},
},
{
kind: 'Field',
name: { kind: 'Name', value: 'members' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'role' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'user' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'FragmentSpread',
name: { kind: 'Name', value: 'UserRefFields' },
},
],
},
},
],
},
},
{
kind: 'Field',
name: { kind: 'Name', value: 'settings' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'Field',
name: { kind: 'Name', value: 'statuses' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'category' },
},
{ kind: 'Field', name: { kind: 'Name', value: 'color' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'requiresReason' },
},
{
kind: 'Field',
name: { kind: 'Name', value: 'archived' },
},
],
},
},
{
kind: 'Field',
name: { kind: 'Name', value: 'transitions' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'from' } },
{ kind: 'Field', name: { kind: 'Name', value: 'to' } },
],
},
},
{
kind: 'Field',
name: { kind: 'Name', value: 'issueTypes' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'icon' } },
{ kind: 'Field', name: { kind: 'Name', value: 'color' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'archived' },
},
],
},
},
{
kind: 'Field',
name: { kind: 'Name', value: 'areas' },
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'archived' },
},
],
},
},
],
},
},
],
},
},
],
} as unknown as DocumentNode<PublicProjectsQuery, PublicProjectsQueryVariables>;
export const UpdateProjectDocument = {
kind: 'Document',
definitions: [
{
kind: 'OperationDefinition',
operation: 'mutation',
name: { kind: 'Name', value: 'UpdateProject' },
variableDefinitions: [
{
kind: 'VariableDefinition',
variable: {
kind: 'Variable',
name: { kind: 'Name', value: 'input' },
},
type: {
kind: 'NonNullType',
type: {
kind: 'NamedType',
name: { kind: 'Name', value: 'UpdateProjectInput' },
},
},
},
],
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'Field',
name: { kind: 'Name', value: 'updateProject' },
arguments: [
{
kind: 'Argument',
name: { kind: 'Name', value: 'input' },
value: {
kind: 'Variable',
name: { kind: 'Name', value: 'input' },
},
},
],
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'FragmentSpread',
name: { kind: 'Name', value: 'CommandResultFields' },
},
],
},
},
],
},
},
{
kind: 'FragmentDefinition',
name: { kind: 'Name', value: 'CommandResultFields' },
typeCondition: {
kind: 'NamedType',
name: { kind: 'Name', value: 'CommandResult' },
},
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
],
},
},
],
} as unknown as DocumentNode<
UpdateProjectMutation,
UpdateProjectMutationVariables
>;
export const DeleteProjectDocument = {
kind: 'Document',
definitions: [
{
kind: 'OperationDefinition',
operation: 'mutation',
name: { kind: 'Name', value: 'DeleteProject' },
variableDefinitions: [
{
kind: 'VariableDefinition',
variable: {
kind: 'Variable',
name: { kind: 'Name', value: 'projectId' },
},
type: {
kind: 'NonNullType',
type: { kind: 'NamedType', name: { kind: 'Name', value: 'ID' } },
},
},
{
kind: 'VariableDefinition',
variable: {
kind: 'Variable',
name: { kind: 'Name', value: 'confirmKey' },
},
type: {
kind: 'NonNullType',
type: {
kind: 'NamedType',
name: { kind: 'Name', value: 'String' },
},
},
},
],
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'Field',
name: { kind: 'Name', value: 'deleteProject' },
arguments: [
{
kind: 'Argument',
name: { kind: 'Name', value: 'projectId' },
value: {
kind: 'Variable',
name: { kind: 'Name', value: 'projectId' },
},
},
{
kind: 'Argument',
name: { kind: 'Name', value: 'confirmKey' },
value: {
kind: 'Variable',
name: { kind: 'Name', value: 'confirmKey' },
},
},
],
selectionSet: {
kind: 'SelectionSet',
selections: [
{
kind: 'FragmentSpread',
name: { kind: 'Name', value: 'CommandResultFields' },
},
],
},
},
],
},
},
{
kind: 'FragmentDefinition',
name: { kind: 'Name', value: 'CommandResultFields' },
typeCondition: {
kind: 'NamedType',
name: { kind: 'Name', value: 'CommandResult' },
},
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'id' } },
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
],
},
},
],
} as unknown as DocumentNode<
DeleteProjectMutation,
DeleteProjectMutationVariables
>;
export const ReleasesDocument = {
kind: 'Document',
definitions: [
@@ -5344,6 +5755,7 @@ export const ProjectChangedDocument = {
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'action' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'project' },
@@ -5392,6 +5804,7 @@ export const ProjectChangedDocument = {
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'description' } },
{ kind: 'Field', name: { kind: 'Name', value: 'isPublic' } },
{ kind: 'Field', name: { kind: 'Name', value: 'updatedAt' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
{
@@ -5530,6 +5943,7 @@ export const MyProjectsChangedDocument = {
selectionSet: {
kind: 'SelectionSet',
selections: [
{ kind: 'Field', name: { kind: 'Name', value: 'action' } },
{
kind: 'Field',
name: { kind: 'Name', value: 'project' },
@@ -5578,6 +5992,7 @@ export const MyProjectsChangedDocument = {
{ kind: 'Field', name: { kind: 'Name', value: 'key' } },
{ kind: 'Field', name: { kind: 'Name', value: 'name' } },
{ kind: 'Field', name: { kind: 'Name', value: 'description' } },
{ kind: 'Field', name: { kind: 'Name', value: 'isPublic' } },
{ kind: 'Field', name: { kind: 'Name', value: 'updatedAt' } },
{ kind: 'Field', name: { kind: 'Name', value: 'version' } },
{

18
libs/web/tracker/infrastructure/src/lib/graphql/projects.graphql
View File

@@ -126,3 +126,21 @@ query ProjectAnalytics($idOrKey: String!, $days: Int!) {
}
}
}
query PublicProjects {
publicProjects {
...ProjectFields
}
}
mutation UpdateProject($input: UpdateProjectInput!) {
updateProject(input: $input) {
...CommandResultFields
}
}
mutation DeleteProject($projectId: ID!, $confirmKey: String!) {
deleteProject(projectId: $projectId, confirmKey: $confirmKey) {
...CommandResultFields
}
}

2
libs/web/tracker/infrastructure/src/lib/graphql/subscriptions.graphql
View File

@@ -35,6 +35,7 @@ subscription ReleaseChanged($projectId: ID!) {
subscription ProjectChanged($projectId: ID!) {
projectChanged(projectId: $projectId) {
action
project {
...ProjectFields
}
@@ -43,6 +44,7 @@ subscription ProjectChanged($projectId: ID!) {
subscription MyProjectsChanged {
myProjectsChanged {
action
project {
...ProjectFields
}