Zoom Meeting
- Link will be sent via email
+
+ 
+
@@ -260,7 +261,9 @@
+ Enter your information
Meeting invites and updates will be sent to your email
-Committee Management
Manage committees, their settings, and organizational structure. Sub-committees are indicated with indentation. -Committee Members
-Committee Members
}
-
Upcoming Meetings
No Upcoming Meetings
There are no upcoming meetings scheduled.
-
-
-
+
-
+
-
+
-
+
+
@if (meetingId()) {
@@ -80,11 +80,11 @@
- Meeting Details
- Manage Guests
+ Meeting Details
+ Manage Guests
-
+
@@ -197,7 +197,7 @@ Manage Guests
}
} @else {
- @if (currentStep() === 0) {
+ @if (currentStep() === 1) {
(undefined);
public attachments = this.initializeAttachments();
// Stepper state
- public currentStep = signal(0);
+ public currentStep = signal(1);
public readonly totalSteps = TOTAL_STEPS;
// Form state
public form = signal(this.createMeetingFormGroup());
@@ -113,10 +113,10 @@ export class MeetingManageComponent {
// Validation signals for template
public readonly canProceed = signal(false);
public readonly canGoNext = computed(() => this.currentStep() + 1 < this.totalSteps && this.canNavigateToStep(this.currentStep() + 1));
- public readonly canGoPrevious = computed(() => this.currentStep() > 0);
- public readonly isFirstStep = computed(() => this.currentStep() === 0);
- public readonly isLastMeetingStep = computed(() => this.currentStep() === this.totalSteps - 2);
- public readonly isLastStep = computed(() => this.currentStep() === this.totalSteps - 1);
+ public readonly canGoPrevious = computed(() => this.currentStep() > 1);
+ public readonly isFirstStep = computed(() => this.currentStep() === 1);
+ public readonly isLastMeetingStep = computed(() => this.currentStep() === this.totalSteps - 1);
+ public readonly isLastStep = computed(() => this.currentStep() === this.totalSteps);
public readonly currentStepTitle = computed(() => this.getStepTitle(this.currentStep()));
public readonly hasRegistrantUpdates = computed(
() => this.registrantUpdates().toAdd.length > 0 || this.registrantUpdates().toUpdate.length > 0 || this.registrantUpdates().toDelete.length > 0
@@ -153,9 +153,9 @@ export class MeetingManageComponent {
public nextStep(): void {
const next = this.currentStep() + 1;
- if (next < this.totalSteps && this.canNavigateToStep(next)) {
+ if (next <= this.totalSteps && this.canNavigateToStep(next)) {
// Auto-generate title when moving from step 1 to step 2
- if (this.currentStep() === 0 && next === 1) {
+ if (this.currentStep() === 1 && next === 2) {
this.generateMeetingTitle();
}
@@ -166,7 +166,7 @@ export class MeetingManageComponent {
public previousStep(): void {
const previous = this.currentStep() - 1;
- if (previous >= 0) {
+ if (previous >= 1) {
this.currentStep.set(previous);
this.scrollToStepper();
}
@@ -308,7 +308,7 @@ export class MeetingManageComponent {
this.meetingId.set(meeting.uid);
// If we're in create mode and not on the last step, continue to next step
- if (!this.isEditMode() && this.currentStep() < this.totalSteps - 1) {
+ if (!this.isEditMode() && this.currentStep() < this.totalSteps) {
this.nextStep();
this.submitting.set(false);
return;
@@ -526,7 +526,7 @@ export class MeetingManageComponent {
}
// For forward navigation, validate all previous steps
- for (let i = 0; i < step; i++) {
+ for (let i = 1; i < step; i++) {
if (!this.isStepValid(i)) {
return false;
}
@@ -543,10 +543,10 @@ export class MeetingManageComponent {
const form = this.form();
switch (step) {
- case 0: // Meeting Type
+ case 1: // Meeting Type
return !!form.get('meeting_type')?.value && form.get('meeting_type')?.value !== '';
- case 1: // Meeting Details
+ case 2: // Meeting Details
return !!(
form.get('title')?.value &&
form.get('description')?.value &&
@@ -559,13 +559,11 @@ export class MeetingManageComponent {
!form.errors?.['futureDateTime']
);
- case 2: // Platform & Features
+ case 3: // Platform & Features
return !!form.get('meetingTool')?.value;
- case 3: // Resources & Summary (optional)
- return true;
-
- case 4: // Manage Guests (optional)
+ case 4: // Resources & Summary (optional)
+ case 5: // Manage Guests (optional)
return true;
default:
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts b/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
index 210dbe0d..2878e47e 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
@@ -152,7 +152,7 @@ export class MeetingRegistrantsComponent implements OnInit {
username: null,
created_at: new Date().toISOString(),
updated_at: new Date().toISOString(),
- type: 'individual',
+ type: 'direct',
invite_accepted: null,
attended: null,
};
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
index 78fadb49..57fa2537 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
@@ -119,11 +119,13 @@
No Meetings Yet
This project doesn't have any meetings yet.
-
}
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts
index 64cdfb17..541fecd8 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts
@@ -19,8 +19,7 @@ import { AnimateOnScrollModule } from 'primeng/animateonscroll';
import { MenuItem } from 'primeng/api';
import { ConfirmDialogModule } from 'primeng/confirmdialog';
import { DialogService } from 'primeng/dynamicdialog';
-import { BehaviorSubject, of } from 'rxjs';
-import { debounceTime, distinctUntilChanged, startWith, switchMap, take, tap } from 'rxjs';
+import { BehaviorSubject, debounceTime, distinctUntilChanged, of, startWith, switchMap, take, tap } from 'rxjs';
import { MeetingCardComponent } from '../components/meeting-card/meeting-card.component';
import { MeetingModalComponent } from '../components/meeting-modal/meeting-modal.component';
@@ -257,13 +256,16 @@ export class MeetingDashboardComponent {
}
private initializeMenuItems(): MenuItem[] {
- const project = this.project();
- return [
- {
+ const items: MenuItem[] = [];
+ if (this.project()?.writer) {
+ items.push({
label: 'Create Meeting',
icon: 'fa-light fa-calendar-plus text-sm',
- routerLink: project ? `/project/${project.slug}/meetings/create` : '#',
- },
+ routerLink: this.project() ? `/project/${this.project()?.slug}/meetings/create` : '#',
+ });
+ }
+
+ items.push(
{
label: this.meetingListView() === 'past' ? 'Upcoming Meetings' : 'Meeting History',
icon: 'fa-light fa-calendar-days text-sm',
@@ -272,8 +274,10 @@ export class MeetingDashboardComponent {
{
label: 'Public Calendar',
icon: 'fa-light fa-calendar-check text-sm',
- },
- ];
+ }
+ );
+
+ return items;
}
private initializePublicMeetingsCount(): Signal {
diff --git a/apps/lfx-pcc/src/app/shared/services/meeting.service.ts b/apps/lfx-pcc/src/app/shared/services/meeting.service.ts
index 79df1fb7..66e61ce4 100644
--- a/apps/lfx-pcc/src/app/shared/services/meeting.service.ts
+++ b/apps/lfx-pcc/src/app/shared/services/meeting.service.ts
@@ -106,8 +106,7 @@ export class MeetingService {
catchError((error) => {
console.error('Failed to create meeting:', error);
return throwError(() => error);
- }),
- tap(console.log)
+ })
);
}
diff --git a/apps/lfx-pcc/src/server/services/access-check.service.ts b/apps/lfx-pcc/src/server/services/access-check.service.ts
new file mode 100644
index 00000000..3c2ee321
--- /dev/null
+++ b/apps/lfx-pcc/src/server/services/access-check.service.ts
@@ -0,0 +1,189 @@
+// Copyright The Linux Foundation and each contributor to LFX.
+// SPDX-License-Identifier: MIT
+
+import { AccessCheckAccessType, AccessCheckApiRequest, AccessCheckApiResponse, AccessCheckRequest, AccessCheckResourceType } from '@lfx-pcc/shared/interfaces';
+import { Request } from 'express';
+
+import { Logger } from '../helpers/logger';
+import { MicroserviceProxyService } from './microservice-proxy.service';
+
+/**
+ * Service for checking user access permissions on resources
+ */
+export class AccessCheckService {
+ private microserviceProxy: MicroserviceProxyService;
+
+ public constructor() {
+ this.microserviceProxy = new MicroserviceProxyService();
+ }
+
+ /**
+ * Check access permissions for multiple resources
+ * @param req Express request object with auth context
+ * @param resources Array of resources to check access for
+ * @returns Map of resource IDs to their access status
+ */
+ public async checkAccess(req: Request, resources: AccessCheckRequest[]): Promise> {
+ if (resources.length === 0) {
+ return new Map();
+ }
+
+ try {
+ // Transform requests to the expected API format
+ const apiRequests = resources.map((resource) => `${resource.resource}:${resource.id}#${resource.access}`);
+
+ const requestPayload: AccessCheckApiRequest = {
+ requests: apiRequests,
+ };
+
+ const sanitizedPayload = Logger.sanitize({
+ request_count: resources.length,
+ resource_types: [...new Set(resources.map((r) => r.resource))],
+ access_types: [...new Set(resources.map((r) => r.access))],
+ });
+ req.log.info(sanitizedPayload, 'Checking access permissions');
+
+ // Make the API request
+ const response = await this.microserviceProxy.proxyRequest(
+ req,
+ 'LFX_V2_SERVICE',
+ '/access-check',
+ 'POST',
+ undefined,
+ requestPayload
+ );
+
+ // Create result map
+ const resultMap = new Map();
+ const userAccessInfo: Array<{ resourceId: string; username?: string; hasAccess: boolean }> = [];
+
+ // Map results back to resource IDs
+ for (let i = 0; i < resources.length; i++) {
+ const resource = resources[i];
+ const resultString = response.results[i];
+
+ // Parse the result string format: "resource:id#access@user:username\ttrue/false"
+ let hasAccess = false;
+ let username: string | undefined;
+
+ if (resultString && typeof resultString === 'string') {
+ // Split by tab to get the boolean part
+ const parts = resultString.split('\t');
+ if (parts.length >= 2) {
+ hasAccess = parts[1]?.toLowerCase() === 'true';
+
+ // Extract username from the first part: "resource:id#access@user:username"
+ const accessPart = parts[0];
+ const userMatch = accessPart?.match(/@user:(.+)$/);
+ if (userMatch) {
+ username = userMatch[1];
+ }
+ }
+ }
+
+ resultMap.set(resource.id, hasAccess);
+ userAccessInfo.push({ resourceId: resource.id, username, hasAccess });
+ }
+
+ req.log.info(
+ Logger.sanitize({
+ operation: 'check_access',
+ request_count: resources.length,
+ granted_count: Array.from(resultMap.values()).filter(Boolean).length,
+ access_details: userAccessInfo,
+ }),
+ 'Access check completed successfully'
+ );
+
+ return resultMap;
+ } catch (error) {
+ req.log.error(
+ {
+ operation: 'check_access',
+ request_count: resources.length,
+ error: error instanceof Error ? error.message : error,
+ },
+ 'Access check failed, defaulting to no access'
+ );
+
+ // Return map with all false values as fallback
+ const fallbackMap = new Map();
+ for (const resource of resources) {
+ fallbackMap.set(resource.id, false);
+ }
+ return fallbackMap;
+ }
+ }
+
+ /**
+ * Check access for a single resource (convenience method)
+ * @param req Express request object with auth context
+ * @param resource Resource to check access for
+ * @returns Boolean indicating whether user has access
+ */
+ public async checkSingleAccess(req: Request, resource: AccessCheckRequest): Promise {
+ const results = await this.checkAccess(req, [resource]);
+ return results.get(resource.id) || false;
+ }
+
+ /**
+ * Add writer access field to multiple resources automatically
+ * @param req Express request object with auth context
+ * @param resources Array of resource objects with uid field
+ * @param resourceType Type of resource (project, meeting, committee)
+ * @param accessType Type of access to check (default: writer)
+ * @returns Array of resources with writer field added
+ */
+ public async addAccessToResources(
+ req: Request,
+ resources: T[],
+ resourceType: AccessCheckResourceType,
+ accessType: AccessCheckAccessType = 'writer'
+ ): Promise<(T & { writer?: boolean })[]> {
+ if (resources.length === 0) {
+ return resources;
+ }
+
+ // Create access check requests for all resources
+ const accessCheckRequests: AccessCheckRequest[] = resources.map((resource) => ({
+ resource: resourceType,
+ id: resource.uid,
+ access: accessType,
+ }));
+
+ // Perform batch access check
+ const accessResults = await this.checkAccess(req, accessCheckRequests);
+
+ // Add access field to each resource
+ return resources.map((resource) => ({
+ ...resource,
+ [accessType]: accessResults.get(resource.uid) || false,
+ }));
+ }
+
+ /**
+ * Add writer access field to a single resource automatically
+ * @param req Express request object with auth context
+ * @param resource Single resource object with uid field
+ * @param resourceType Type of resource (project, meeting, committee)
+ * @param accessType Type of access to check (default: writer)
+ * @returns Resource with writer field added
+ */
+ public async addAccessToResource(
+ req: Request,
+ resource: T,
+ resourceType: AccessCheckResourceType,
+ accessType: AccessCheckAccessType = 'writer'
+ ): Promise {
+ const hasAccess = await this.checkSingleAccess(req, {
+ resource: resourceType,
+ id: resource.uid,
+ access: accessType,
+ });
+
+ return {
+ ...resource,
+ [accessType]: hasAccess,
+ };
+ }
+}
diff --git a/apps/lfx-pcc/src/server/services/committee.service.ts b/apps/lfx-pcc/src/server/services/committee.service.ts
index 7e0cea43..1597478d 100644
--- a/apps/lfx-pcc/src/server/services/committee.service.ts
+++ b/apps/lfx-pcc/src/server/services/committee.service.ts
@@ -14,6 +14,7 @@ import { Request } from 'express';
import { ResourceNotFoundError } from '../errors';
import { Logger } from '../helpers/logger';
+import { AccessCheckService } from './access-check.service';
import { ETagService } from './etag.service';
import { MicroserviceProxyService } from './microservice-proxy.service';
@@ -21,10 +22,12 @@ import { MicroserviceProxyService } from './microservice-proxy.service';
* Service for handling committee business logic
*/
export class CommitteeService {
+ private accessCheckService: AccessCheckService;
private etagService: ETagService;
private microserviceProxy: MicroserviceProxyService;
public constructor() {
+ this.accessCheckService = new AccessCheckService();
this.microserviceProxy = new MicroserviceProxyService();
this.etagService = new ETagService();
}
@@ -40,7 +43,10 @@ export class CommitteeService {
const { resources } = await this.microserviceProxy.proxyRequest>(req, 'LFX_V2_SERVICE', '/query/resources', 'GET', params);
- return resources.map((resource) => resource.data);
+ const committees = resources.map((resource) => resource.data);
+
+ // Add writer access field to all committees
+ return await this.accessCheckService.addAccessToResources(req, committees, 'committee');
}
/**
@@ -62,7 +68,10 @@ export class CommitteeService {
});
}
- return resources[0].data;
+ const committee = resources[0].data;
+
+ // Add writer access field to the committee
+ return await this.accessCheckService.addAccessToResource(req, committee, 'committee');
}
/**
diff --git a/apps/lfx-pcc/src/server/services/meeting.service.ts b/apps/lfx-pcc/src/server/services/meeting.service.ts
index ccdcd90a..ccd0563c 100644
--- a/apps/lfx-pcc/src/server/services/meeting.service.ts
+++ b/apps/lfx-pcc/src/server/services/meeting.service.ts
@@ -15,6 +15,7 @@ import { Request } from 'express';
import { ResourceNotFoundError } from '../errors';
import { Logger } from '../helpers/logger';
import { getUsernameFromAuth } from '../utils/auth-helper';
+import { AccessCheckService } from './access-check.service';
import { ETagService } from './etag.service';
import { MicroserviceProxyService } from './microservice-proxy.service';
@@ -22,10 +23,12 @@ import { MicroserviceProxyService } from './microservice-proxy.service';
* Service for handling meeting business logic with microservice proxy
*/
export class MeetingService {
+ private accessCheckService: AccessCheckService;
private etagService: ETagService;
private microserviceProxy: MicroserviceProxyService;
public constructor() {
+ this.accessCheckService = new AccessCheckService();
this.microserviceProxy = new MicroserviceProxyService();
this.etagService = new ETagService();
}
@@ -41,7 +44,10 @@ export class MeetingService {
const { resources } = await this.microserviceProxy.proxyRequest>(req, 'LFX_V2_SERVICE', '/query/resources', 'GET', params);
- return resources.map((resource) => resource.data);
+ const meetings = resources.map((resource) => resource.data);
+
+ // Add writer access field to all meetings
+ return await this.accessCheckService.addAccessToResources(req, meetings, 'meeting', 'organizer');
}
/**
@@ -73,7 +79,10 @@ export class MeetingService {
);
}
- return resources[0].data;
+ const meeting = resources[0].data;
+
+ // Add writer access field to the meeting
+ return await this.accessCheckService.addAccessToResource(req, meeting, 'meeting', 'organizer');
}
/**
diff --git a/apps/lfx-pcc/src/server/services/project.service.ts b/apps/lfx-pcc/src/server/services/project.service.ts
index 98ca9545..d0943849 100644
--- a/apps/lfx-pcc/src/server/services/project.service.ts
+++ b/apps/lfx-pcc/src/server/services/project.service.ts
@@ -5,6 +5,7 @@ import { Project, QueryServiceResponse } from '@lfx-pcc/shared/interfaces';
import { Request } from 'express';
import { ResourceNotFoundError } from '../errors';
+import { AccessCheckService } from './access-check.service';
import { MicroserviceProxyService } from './microservice-proxy.service';
import { NatsService } from './nats.service';
@@ -12,10 +13,12 @@ import { NatsService } from './nats.service';
* Service for handling project business logic
*/
export class ProjectService {
+ private accessCheckService: AccessCheckService;
private microserviceProxy: MicroserviceProxyService;
private natsService: NatsService;
public constructor() {
+ this.accessCheckService = new AccessCheckService();
this.microserviceProxy = new MicroserviceProxyService();
this.natsService = new NatsService();
}
@@ -31,7 +34,10 @@ export class ProjectService {
const { resources } = await this.microserviceProxy.proxyRequest>(req, 'LFX_V2_SERVICE', '/query/resources', 'GET', params);
- return resources.map((resource) => resource.data);
+ const projects = resources.map((resource) => resource.data);
+
+ // Add writer access field to all projects
+ return await this.accessCheckService.addAccessToResources(req, projects, 'project');
}
/**
@@ -63,7 +69,10 @@ export class ProjectService {
);
}
- return resources[0].data;
+ const project = resources[0].data;
+
+ // Add writer access field to the project
+ return await this.accessCheckService.addAccessToResource(req, project, 'project');
}
/**
diff --git a/packages/shared/src/interfaces/access-check.interface.ts b/packages/shared/src/interfaces/access-check.interface.ts
new file mode 100644
index 00000000..f0161712
--- /dev/null
+++ b/packages/shared/src/interfaces/access-check.interface.ts
@@ -0,0 +1,36 @@
+// Copyright The Linux Foundation and each contributor to LFX.
+// SPDX-License-Identifier: MIT
+
+/**
+ * Access check request for a single resource
+ */
+export interface AccessCheckRequest {
+ /** Resource type (project, meeting, committee) */
+ resource: AccessCheckResourceType;
+ /** Resource unique identifier */
+ id: string;
+ /** Access type to check (writer, viewer, etc.) */
+ access: AccessCheckAccessType;
+}
+
+/**
+ * Internal format for the microservice access check API
+ */
+export interface AccessCheckApiRequest {
+ /** Array of access check strings in format "resource:id#access" */
+ requests: string[];
+}
+
+/**
+ * Response from the access check microservice
+ */
+export interface AccessCheckApiResponse {
+ /** Array of result strings in format "resource:id#access@user:username\ttrue/false" */
+ results: string[];
+}
+
+/**
+ * Resource types
+ */
+export type AccessCheckResourceType = 'project' | 'meeting' | 'committee';
+export type AccessCheckAccessType = 'writer' | 'viewer' | 'organizer';
diff --git a/packages/shared/src/interfaces/committee.interface.ts b/packages/shared/src/interfaces/committee.interface.ts
index 75b62842..0954acc8 100644
--- a/packages/shared/src/interfaces/committee.interface.ts
+++ b/packages/shared/src/interfaces/committee.interface.ts
@@ -12,6 +12,8 @@ export interface Committee {
name: string;
/** Display name for UI presentation (optional override) */
display_name?: string;
+ /** Write access permission for current user (response only) */
+ writer?: boolean;
/** Committee category/type (e.g., "Technical", "Legal", "Board") */
category: string;
/** Optional description of the committee's purpose */
diff --git a/packages/shared/src/interfaces/index.ts b/packages/shared/src/interfaces/index.ts
index e12a3c92..98cd5072 100644
--- a/packages/shared/src/interfaces/index.ts
+++ b/packages/shared/src/interfaces/index.ts
@@ -45,3 +45,6 @@ export * from './nats.interface';
// AI interfaces
export * from './ai.interface';
+
+// Access check interfaces
+export * from './access-check.interface';
diff --git a/packages/shared/src/interfaces/meeting.interface.ts b/packages/shared/src/interfaces/meeting.interface.ts
index 4e11f337..84c613c2 100644
--- a/packages/shared/src/interfaces/meeting.interface.ts
+++ b/packages/shared/src/interfaces/meeting.interface.ts
@@ -86,6 +86,8 @@ export interface Meeting {
created_at: string;
/** Timestamp when meeting was last updated */
updated_at: string;
+ /** Write access permission for current user (response only) */
+ organizer?: boolean;
// Required API fields
/** UUID of the LF project */
@@ -274,7 +276,9 @@ export interface MeetingRegistrant {
// Fields NOT in API - likely response-only
/** Registrant's type */
- type: 'individual' | 'committee';
+ type: 'direct' | 'committee';
+ /** Registrant Committee UID (if type is committee) */
+ committee_uid?: string | null;
/** Registrant's invite accepted status */
invite_accepted: boolean | null;
/** Registrant's attended status */
diff --git a/packages/shared/src/interfaces/project.interface.ts b/packages/shared/src/interfaces/project.interface.ts
index f57a5fde..6e83be39 100644
--- a/packages/shared/src/interfaces/project.interface.ts
+++ b/packages/shared/src/interfaces/project.interface.ts
@@ -60,6 +60,8 @@ export interface Project {
description: string;
/** Project display name */
name: string;
+ /** Write access permission for current user (response only) */
+ writer?: boolean;
/** Whether project is publicly visible */
public: boolean;
/** Parent project UID (for subprojects) */
- Meeting Details
- Manage Guests
+ Meeting Details
+ Manage Guests
-
+
@@ -197,7 +197,7 @@ Manage Guests
}
} @else {
- @if (currentStep() === 0) {
+ @if (currentStep() === 1) {
(undefined);
public attachments = this.initializeAttachments();
// Stepper state
- public currentStep = signal(0);
+ public currentStep = signal(1);
public readonly totalSteps = TOTAL_STEPS;
// Form state
public form = signal(this.createMeetingFormGroup());
@@ -113,10 +113,10 @@ export class MeetingManageComponent {
// Validation signals for template
public readonly canProceed = signal(false);
public readonly canGoNext = computed(() => this.currentStep() + 1 < this.totalSteps && this.canNavigateToStep(this.currentStep() + 1));
- public readonly canGoPrevious = computed(() => this.currentStep() > 0);
- public readonly isFirstStep = computed(() => this.currentStep() === 0);
- public readonly isLastMeetingStep = computed(() => this.currentStep() === this.totalSteps - 2);
- public readonly isLastStep = computed(() => this.currentStep() === this.totalSteps - 1);
+ public readonly canGoPrevious = computed(() => this.currentStep() > 1);
+ public readonly isFirstStep = computed(() => this.currentStep() === 1);
+ public readonly isLastMeetingStep = computed(() => this.currentStep() === this.totalSteps - 1);
+ public readonly isLastStep = computed(() => this.currentStep() === this.totalSteps);
public readonly currentStepTitle = computed(() => this.getStepTitle(this.currentStep()));
public readonly hasRegistrantUpdates = computed(
() => this.registrantUpdates().toAdd.length > 0 || this.registrantUpdates().toUpdate.length > 0 || this.registrantUpdates().toDelete.length > 0
@@ -153,9 +153,9 @@ export class MeetingManageComponent {
public nextStep(): void {
const next = this.currentStep() + 1;
- if (next < this.totalSteps && this.canNavigateToStep(next)) {
+ if (next <= this.totalSteps && this.canNavigateToStep(next)) {
// Auto-generate title when moving from step 1 to step 2
- if (this.currentStep() === 0 && next === 1) {
+ if (this.currentStep() === 1 && next === 2) {
this.generateMeetingTitle();
}
@@ -166,7 +166,7 @@ export class MeetingManageComponent {
public previousStep(): void {
const previous = this.currentStep() - 1;
- if (previous >= 0) {
+ if (previous >= 1) {
this.currentStep.set(previous);
this.scrollToStepper();
}
@@ -308,7 +308,7 @@ export class MeetingManageComponent {
this.meetingId.set(meeting.uid);
// If we're in create mode and not on the last step, continue to next step
- if (!this.isEditMode() && this.currentStep() < this.totalSteps - 1) {
+ if (!this.isEditMode() && this.currentStep() < this.totalSteps) {
this.nextStep();
this.submitting.set(false);
return;
@@ -526,7 +526,7 @@ export class MeetingManageComponent {
}
// For forward navigation, validate all previous steps
- for (let i = 0; i < step; i++) {
+ for (let i = 1; i < step; i++) {
if (!this.isStepValid(i)) {
return false;
}
@@ -543,10 +543,10 @@ export class MeetingManageComponent {
const form = this.form();
switch (step) {
- case 0: // Meeting Type
+ case 1: // Meeting Type
return !!form.get('meeting_type')?.value && form.get('meeting_type')?.value !== '';
- case 1: // Meeting Details
+ case 2: // Meeting Details
return !!(
form.get('title')?.value &&
form.get('description')?.value &&
@@ -559,13 +559,11 @@ export class MeetingManageComponent {
!form.errors?.['futureDateTime']
);
- case 2: // Platform & Features
+ case 3: // Platform & Features
return !!form.get('meetingTool')?.value;
- case 3: // Resources & Summary (optional)
- return true;
-
- case 4: // Manage Guests (optional)
+ case 4: // Resources & Summary (optional)
+ case 5: // Manage Guests (optional)
return true;
default:
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts b/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
index 210dbe0d..2878e47e 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
@@ -152,7 +152,7 @@ export class MeetingRegistrantsComponent implements OnInit {
username: null,
created_at: new Date().toISOString(),
updated_at: new Date().toISOString(),
- type: 'individual',
+ type: 'direct',
invite_accepted: null,
attended: null,
};
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
index 78fadb49..57fa2537 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
@@ -119,11 +119,13 @@
No Meetings Yet
This project doesn't have any meetings yet.
-
}
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts
index 64cdfb17..541fecd8 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.ts
@@ -19,8 +19,7 @@ import { AnimateOnScrollModule } from 'primeng/animateonscroll';
import { MenuItem } from 'primeng/api';
import { ConfirmDialogModule } from 'primeng/confirmdialog';
import { DialogService } from 'primeng/dynamicdialog';
-import { BehaviorSubject, of } from 'rxjs';
-import { debounceTime, distinctUntilChanged, startWith, switchMap, take, tap } from 'rxjs';
+import { BehaviorSubject, debounceTime, distinctUntilChanged, of, startWith, switchMap, take, tap } from 'rxjs';
import { MeetingCardComponent } from '../components/meeting-card/meeting-card.component';
import { MeetingModalComponent } from '../components/meeting-modal/meeting-modal.component';
@@ -257,13 +256,16 @@ export class MeetingDashboardComponent {
}
private initializeMenuItems(): MenuItem[] {
- const project = this.project();
- return [
- {
+ const items: MenuItem[] = [];
+ if (this.project()?.writer) {
+ items.push({
label: 'Create Meeting',
icon: 'fa-light fa-calendar-plus text-sm',
- routerLink: project ? `/project/${project.slug}/meetings/create` : '#',
- },
+ routerLink: this.project() ? `/project/${this.project()?.slug}/meetings/create` : '#',
+ });
+ }
+
+ items.push(
{
label: this.meetingListView() === 'past' ? 'Upcoming Meetings' : 'Meeting History',
icon: 'fa-light fa-calendar-days text-sm',
@@ -272,8 +274,10 @@ export class MeetingDashboardComponent {
{
label: 'Public Calendar',
icon: 'fa-light fa-calendar-check text-sm',
- },
- ];
+ }
+ );
+
+ return items;
}
private initializePublicMeetingsCount(): Signal {
diff --git a/apps/lfx-pcc/src/app/shared/services/meeting.service.ts b/apps/lfx-pcc/src/app/shared/services/meeting.service.ts
index 79df1fb7..66e61ce4 100644
--- a/apps/lfx-pcc/src/app/shared/services/meeting.service.ts
+++ b/apps/lfx-pcc/src/app/shared/services/meeting.service.ts
@@ -106,8 +106,7 @@ export class MeetingService {
catchError((error) => {
console.error('Failed to create meeting:', error);
return throwError(() => error);
- }),
- tap(console.log)
+ })
);
}
diff --git a/apps/lfx-pcc/src/server/services/access-check.service.ts b/apps/lfx-pcc/src/server/services/access-check.service.ts
new file mode 100644
index 00000000..3c2ee321
--- /dev/null
+++ b/apps/lfx-pcc/src/server/services/access-check.service.ts
@@ -0,0 +1,189 @@
+// Copyright The Linux Foundation and each contributor to LFX.
+// SPDX-License-Identifier: MIT
+
+import { AccessCheckAccessType, AccessCheckApiRequest, AccessCheckApiResponse, AccessCheckRequest, AccessCheckResourceType } from '@lfx-pcc/shared/interfaces';
+import { Request } from 'express';
+
+import { Logger } from '../helpers/logger';
+import { MicroserviceProxyService } from './microservice-proxy.service';
+
+/**
+ * Service for checking user access permissions on resources
+ */
+export class AccessCheckService {
+ private microserviceProxy: MicroserviceProxyService;
+
+ public constructor() {
+ this.microserviceProxy = new MicroserviceProxyService();
+ }
+
+ /**
+ * Check access permissions for multiple resources
+ * @param req Express request object with auth context
+ * @param resources Array of resources to check access for
+ * @returns Map of resource IDs to their access status
+ */
+ public async checkAccess(req: Request, resources: AccessCheckRequest[]): Promise> {
+ if (resources.length === 0) {
+ return new Map();
+ }
+
+ try {
+ // Transform requests to the expected API format
+ const apiRequests = resources.map((resource) => `${resource.resource}:${resource.id}#${resource.access}`);
+
+ const requestPayload: AccessCheckApiRequest = {
+ requests: apiRequests,
+ };
+
+ const sanitizedPayload = Logger.sanitize({
+ request_count: resources.length,
+ resource_types: [...new Set(resources.map((r) => r.resource))],
+ access_types: [...new Set(resources.map((r) => r.access))],
+ });
+ req.log.info(sanitizedPayload, 'Checking access permissions');
+
+ // Make the API request
+ const response = await this.microserviceProxy.proxyRequest(
+ req,
+ 'LFX_V2_SERVICE',
+ '/access-check',
+ 'POST',
+ undefined,
+ requestPayload
+ );
+
+ // Create result map
+ const resultMap = new Map();
+ const userAccessInfo: Array<{ resourceId: string; username?: string; hasAccess: boolean }> = [];
+
+ // Map results back to resource IDs
+ for (let i = 0; i < resources.length; i++) {
+ const resource = resources[i];
+ const resultString = response.results[i];
+
+ // Parse the result string format: "resource:id#access@user:username\ttrue/false"
+ let hasAccess = false;
+ let username: string | undefined;
+
+ if (resultString && typeof resultString === 'string') {
+ // Split by tab to get the boolean part
+ const parts = resultString.split('\t');
+ if (parts.length >= 2) {
+ hasAccess = parts[1]?.toLowerCase() === 'true';
+
+ // Extract username from the first part: "resource:id#access@user:username"
+ const accessPart = parts[0];
+ const userMatch = accessPart?.match(/@user:(.+)$/);
+ if (userMatch) {
+ username = userMatch[1];
+ }
+ }
+ }
+
+ resultMap.set(resource.id, hasAccess);
+ userAccessInfo.push({ resourceId: resource.id, username, hasAccess });
+ }
+
+ req.log.info(
+ Logger.sanitize({
+ operation: 'check_access',
+ request_count: resources.length,
+ granted_count: Array.from(resultMap.values()).filter(Boolean).length,
+ access_details: userAccessInfo,
+ }),
+ 'Access check completed successfully'
+ );
+
+ return resultMap;
+ } catch (error) {
+ req.log.error(
+ {
+ operation: 'check_access',
+ request_count: resources.length,
+ error: error instanceof Error ? error.message : error,
+ },
+ 'Access check failed, defaulting to no access'
+ );
+
+ // Return map with all false values as fallback
+ const fallbackMap = new Map();
+ for (const resource of resources) {
+ fallbackMap.set(resource.id, false);
+ }
+ return fallbackMap;
+ }
+ }
+
+ /**
+ * Check access for a single resource (convenience method)
+ * @param req Express request object with auth context
+ * @param resource Resource to check access for
+ * @returns Boolean indicating whether user has access
+ */
+ public async checkSingleAccess(req: Request, resource: AccessCheckRequest): Promise {
+ const results = await this.checkAccess(req, [resource]);
+ return results.get(resource.id) || false;
+ }
+
+ /**
+ * Add writer access field to multiple resources automatically
+ * @param req Express request object with auth context
+ * @param resources Array of resource objects with uid field
+ * @param resourceType Type of resource (project, meeting, committee)
+ * @param accessType Type of access to check (default: writer)
+ * @returns Array of resources with writer field added
+ */
+ public async addAccessToResources(
+ req: Request,
+ resources: T[],
+ resourceType: AccessCheckResourceType,
+ accessType: AccessCheckAccessType = 'writer'
+ ): Promise<(T & { writer?: boolean })[]> {
+ if (resources.length === 0) {
+ return resources;
+ }
+
+ // Create access check requests for all resources
+ const accessCheckRequests: AccessCheckRequest[] = resources.map((resource) => ({
+ resource: resourceType,
+ id: resource.uid,
+ access: accessType,
+ }));
+
+ // Perform batch access check
+ const accessResults = await this.checkAccess(req, accessCheckRequests);
+
+ // Add access field to each resource
+ return resources.map((resource) => ({
+ ...resource,
+ [accessType]: accessResults.get(resource.uid) || false,
+ }));
+ }
+
+ /**
+ * Add writer access field to a single resource automatically
+ * @param req Express request object with auth context
+ * @param resource Single resource object with uid field
+ * @param resourceType Type of resource (project, meeting, committee)
+ * @param accessType Type of access to check (default: writer)
+ * @returns Resource with writer field added
+ */
+ public async addAccessToResource(
+ req: Request,
+ resource: T,
+ resourceType: AccessCheckResourceType,
+ accessType: AccessCheckAccessType = 'writer'
+ ): Promise {
+ const hasAccess = await this.checkSingleAccess(req, {
+ resource: resourceType,
+ id: resource.uid,
+ access: accessType,
+ });
+
+ return {
+ ...resource,
+ [accessType]: hasAccess,
+ };
+ }
+}
diff --git a/apps/lfx-pcc/src/server/services/committee.service.ts b/apps/lfx-pcc/src/server/services/committee.service.ts
index 7e0cea43..1597478d 100644
--- a/apps/lfx-pcc/src/server/services/committee.service.ts
+++ b/apps/lfx-pcc/src/server/services/committee.service.ts
@@ -14,6 +14,7 @@ import { Request } from 'express';
import { ResourceNotFoundError } from '../errors';
import { Logger } from '../helpers/logger';
+import { AccessCheckService } from './access-check.service';
import { ETagService } from './etag.service';
import { MicroserviceProxyService } from './microservice-proxy.service';
@@ -21,10 +22,12 @@ import { MicroserviceProxyService } from './microservice-proxy.service';
* Service for handling committee business logic
*/
export class CommitteeService {
+ private accessCheckService: AccessCheckService;
private etagService: ETagService;
private microserviceProxy: MicroserviceProxyService;
public constructor() {
+ this.accessCheckService = new AccessCheckService();
this.microserviceProxy = new MicroserviceProxyService();
this.etagService = new ETagService();
}
@@ -40,7 +43,10 @@ export class CommitteeService {
const { resources } = await this.microserviceProxy.proxyRequest>(req, 'LFX_V2_SERVICE', '/query/resources', 'GET', params);
- return resources.map((resource) => resource.data);
+ const committees = resources.map((resource) => resource.data);
+
+ // Add writer access field to all committees
+ return await this.accessCheckService.addAccessToResources(req, committees, 'committee');
}
/**
@@ -62,7 +68,10 @@ export class CommitteeService {
});
}
- return resources[0].data;
+ const committee = resources[0].data;
+
+ // Add writer access field to the committee
+ return await this.accessCheckService.addAccessToResource(req, committee, 'committee');
}
/**
diff --git a/apps/lfx-pcc/src/server/services/meeting.service.ts b/apps/lfx-pcc/src/server/services/meeting.service.ts
index ccdcd90a..ccd0563c 100644
--- a/apps/lfx-pcc/src/server/services/meeting.service.ts
+++ b/apps/lfx-pcc/src/server/services/meeting.service.ts
@@ -15,6 +15,7 @@ import { Request } from 'express';
import { ResourceNotFoundError } from '../errors';
import { Logger } from '../helpers/logger';
import { getUsernameFromAuth } from '../utils/auth-helper';
+import { AccessCheckService } from './access-check.service';
import { ETagService } from './etag.service';
import { MicroserviceProxyService } from './microservice-proxy.service';
@@ -22,10 +23,12 @@ import { MicroserviceProxyService } from './microservice-proxy.service';
* Service for handling meeting business logic with microservice proxy
*/
export class MeetingService {
+ private accessCheckService: AccessCheckService;
private etagService: ETagService;
private microserviceProxy: MicroserviceProxyService;
public constructor() {
+ this.accessCheckService = new AccessCheckService();
this.microserviceProxy = new MicroserviceProxyService();
this.etagService = new ETagService();
}
@@ -41,7 +44,10 @@ export class MeetingService {
const { resources } = await this.microserviceProxy.proxyRequest>(req, 'LFX_V2_SERVICE', '/query/resources', 'GET', params);
- return resources.map((resource) => resource.data);
+ const meetings = resources.map((resource) => resource.data);
+
+ // Add writer access field to all meetings
+ return await this.accessCheckService.addAccessToResources(req, meetings, 'meeting', 'organizer');
}
/**
@@ -73,7 +79,10 @@ export class MeetingService {
);
}
- return resources[0].data;
+ const meeting = resources[0].data;
+
+ // Add writer access field to the meeting
+ return await this.accessCheckService.addAccessToResource(req, meeting, 'meeting', 'organizer');
}
/**
diff --git a/apps/lfx-pcc/src/server/services/project.service.ts b/apps/lfx-pcc/src/server/services/project.service.ts
index 98ca9545..d0943849 100644
--- a/apps/lfx-pcc/src/server/services/project.service.ts
+++ b/apps/lfx-pcc/src/server/services/project.service.ts
@@ -5,6 +5,7 @@ import { Project, QueryServiceResponse } from '@lfx-pcc/shared/interfaces';
import { Request } from 'express';
import { ResourceNotFoundError } from '../errors';
+import { AccessCheckService } from './access-check.service';
import { MicroserviceProxyService } from './microservice-proxy.service';
import { NatsService } from './nats.service';
@@ -12,10 +13,12 @@ import { NatsService } from './nats.service';
* Service for handling project business logic
*/
export class ProjectService {
+ private accessCheckService: AccessCheckService;
private microserviceProxy: MicroserviceProxyService;
private natsService: NatsService;
public constructor() {
+ this.accessCheckService = new AccessCheckService();
this.microserviceProxy = new MicroserviceProxyService();
this.natsService = new NatsService();
}
@@ -31,7 +34,10 @@ export class ProjectService {
const { resources } = await this.microserviceProxy.proxyRequest>(req, 'LFX_V2_SERVICE', '/query/resources', 'GET', params);
- return resources.map((resource) => resource.data);
+ const projects = resources.map((resource) => resource.data);
+
+ // Add writer access field to all projects
+ return await this.accessCheckService.addAccessToResources(req, projects, 'project');
}
/**
@@ -63,7 +69,10 @@ export class ProjectService {
);
}
- return resources[0].data;
+ const project = resources[0].data;
+
+ // Add writer access field to the project
+ return await this.accessCheckService.addAccessToResource(req, project, 'project');
}
/**
diff --git a/packages/shared/src/interfaces/access-check.interface.ts b/packages/shared/src/interfaces/access-check.interface.ts
new file mode 100644
index 00000000..f0161712
--- /dev/null
+++ b/packages/shared/src/interfaces/access-check.interface.ts
@@ -0,0 +1,36 @@
+// Copyright The Linux Foundation and each contributor to LFX.
+// SPDX-License-Identifier: MIT
+
+/**
+ * Access check request for a single resource
+ */
+export interface AccessCheckRequest {
+ /** Resource type (project, meeting, committee) */
+ resource: AccessCheckResourceType;
+ /** Resource unique identifier */
+ id: string;
+ /** Access type to check (writer, viewer, etc.) */
+ access: AccessCheckAccessType;
+}
+
+/**
+ * Internal format for the microservice access check API
+ */
+export interface AccessCheckApiRequest {
+ /** Array of access check strings in format "resource:id#access" */
+ requests: string[];
+}
+
+/**
+ * Response from the access check microservice
+ */
+export interface AccessCheckApiResponse {
+ /** Array of result strings in format "resource:id#access@user:username\ttrue/false" */
+ results: string[];
+}
+
+/**
+ * Resource types
+ */
+export type AccessCheckResourceType = 'project' | 'meeting' | 'committee';
+export type AccessCheckAccessType = 'writer' | 'viewer' | 'organizer';
diff --git a/packages/shared/src/interfaces/committee.interface.ts b/packages/shared/src/interfaces/committee.interface.ts
index 75b62842..0954acc8 100644
--- a/packages/shared/src/interfaces/committee.interface.ts
+++ b/packages/shared/src/interfaces/committee.interface.ts
@@ -12,6 +12,8 @@ export interface Committee {
name: string;
/** Display name for UI presentation (optional override) */
display_name?: string;
+ /** Write access permission for current user (response only) */
+ writer?: boolean;
/** Committee category/type (e.g., "Technical", "Legal", "Board") */
category: string;
/** Optional description of the committee's purpose */
diff --git a/packages/shared/src/interfaces/index.ts b/packages/shared/src/interfaces/index.ts
index e12a3c92..98cd5072 100644
--- a/packages/shared/src/interfaces/index.ts
+++ b/packages/shared/src/interfaces/index.ts
@@ -45,3 +45,6 @@ export * from './nats.interface';
// AI interfaces
export * from './ai.interface';
+
+// Access check interfaces
+export * from './access-check.interface';
diff --git a/packages/shared/src/interfaces/meeting.interface.ts b/packages/shared/src/interfaces/meeting.interface.ts
index 4e11f337..84c613c2 100644
--- a/packages/shared/src/interfaces/meeting.interface.ts
+++ b/packages/shared/src/interfaces/meeting.interface.ts
@@ -86,6 +86,8 @@ export interface Meeting {
created_at: string;
/** Timestamp when meeting was last updated */
updated_at: string;
+ /** Write access permission for current user (response only) */
+ organizer?: boolean;
// Required API fields
/** UUID of the LF project */
@@ -274,7 +276,9 @@ export interface MeetingRegistrant {
// Fields NOT in API - likely response-only
/** Registrant's type */
- type: 'individual' | 'committee';
+ type: 'direct' | 'committee';
+ /** Registrant Committee UID (if type is committee) */
+ committee_uid?: string | null;
/** Registrant's invite accepted status */
invite_accepted: boolean | null;
/** Registrant's attended status */
diff --git a/packages/shared/src/interfaces/project.interface.ts b/packages/shared/src/interfaces/project.interface.ts
index f57a5fde..6e83be39 100644
--- a/packages/shared/src/interfaces/project.interface.ts
+++ b/packages/shared/src/interfaces/project.interface.ts
@@ -60,6 +60,8 @@ export interface Project {
description: string;
/** Project display name */
name: string;
+ /** Write access permission for current user (response only) */
+ writer?: boolean;
/** Whether project is publicly visible */
public: boolean;
/** Parent project UID (for subprojects) */
@@ -197,7 +197,7 @@ (undefined);
public attachments = this.initializeAttachments();
// Stepper state
- public currentStep = signal(0);
+ public currentStep = signal(1);
public readonly totalSteps = TOTAL_STEPS;
// Form state
public form = signal(this.createMeetingFormGroup());
@@ -113,10 +113,10 @@ export class MeetingManageComponent {
// Validation signals for template
public readonly canProceed = signal(false);
public readonly canGoNext = computed(() => this.currentStep() + 1 < this.totalSteps && this.canNavigateToStep(this.currentStep() + 1));
- public readonly canGoPrevious = computed(() => this.currentStep() > 0);
- public readonly isFirstStep = computed(() => this.currentStep() === 0);
- public readonly isLastMeetingStep = computed(() => this.currentStep() === this.totalSteps - 2);
- public readonly isLastStep = computed(() => this.currentStep() === this.totalSteps - 1);
+ public readonly canGoPrevious = computed(() => this.currentStep() > 1);
+ public readonly isFirstStep = computed(() => this.currentStep() === 1);
+ public readonly isLastMeetingStep = computed(() => this.currentStep() === this.totalSteps - 1);
+ public readonly isLastStep = computed(() => this.currentStep() === this.totalSteps);
public readonly currentStepTitle = computed(() => this.getStepTitle(this.currentStep()));
public readonly hasRegistrantUpdates = computed(
() => this.registrantUpdates().toAdd.length > 0 || this.registrantUpdates().toUpdate.length > 0 || this.registrantUpdates().toDelete.length > 0
@@ -153,9 +153,9 @@ export class MeetingManageComponent {
public nextStep(): void {
const next = this.currentStep() + 1;
- if (next < this.totalSteps && this.canNavigateToStep(next)) {
+ if (next <= this.totalSteps && this.canNavigateToStep(next)) {
// Auto-generate title when moving from step 1 to step 2
- if (this.currentStep() === 0 && next === 1) {
+ if (this.currentStep() === 1 && next === 2) {
this.generateMeetingTitle();
}
@@ -166,7 +166,7 @@ export class MeetingManageComponent {
public previousStep(): void {
const previous = this.currentStep() - 1;
- if (previous >= 0) {
+ if (previous >= 1) {
this.currentStep.set(previous);
this.scrollToStepper();
}
@@ -308,7 +308,7 @@ export class MeetingManageComponent {
this.meetingId.set(meeting.uid);
// If we're in create mode and not on the last step, continue to next step
- if (!this.isEditMode() && this.currentStep() < this.totalSteps - 1) {
+ if (!this.isEditMode() && this.currentStep() < this.totalSteps) {
this.nextStep();
this.submitting.set(false);
return;
@@ -526,7 +526,7 @@ export class MeetingManageComponent {
}
// For forward navigation, validate all previous steps
- for (let i = 0; i < step; i++) {
+ for (let i = 1; i < step; i++) {
if (!this.isStepValid(i)) {
return false;
}
@@ -543,10 +543,10 @@ export class MeetingManageComponent {
const form = this.form();
switch (step) {
- case 0: // Meeting Type
+ case 1: // Meeting Type
return !!form.get('meeting_type')?.value && form.get('meeting_type')?.value !== '';
- case 1: // Meeting Details
+ case 2: // Meeting Details
return !!(
form.get('title')?.value &&
form.get('description')?.value &&
@@ -559,13 +559,11 @@ export class MeetingManageComponent {
!form.errors?.['futureDateTime']
);
- case 2: // Platform & Features
+ case 3: // Platform & Features
return !!form.get('meetingTool')?.value;
- case 3: // Resources & Summary (optional)
- return true;
-
- case 4: // Manage Guests (optional)
+ case 4: // Resources & Summary (optional)
+ case 5: // Manage Guests (optional)
return true;
default:
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts b/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
index 210dbe0d..2878e47e 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/components/meeting-registrants/meeting-registrants.component.ts
@@ -152,7 +152,7 @@ export class MeetingRegistrantsComponent implements OnInit {
username: null,
created_at: new Date().toISOString(),
updated_at: new Date().toISOString(),
- type: 'individual',
+ type: 'direct',
invite_accepted: null,
attended: null,
};
diff --git a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
index 78fadb49..57fa2537 100644
--- a/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
+++ b/apps/lfx-pcc/src/app/modules/project/meetings/meeting-dashboard/meeting-dashboard.component.html
@@ -119,11 +119,13 @@
Manage Guests
} } @else { - @if (currentStep() === 0) { + @if (currentStep() === 1) {No Meetings Yet
This project doesn't have any meetings yet.
-