Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,19 @@ <h3 class="text-gray-600 text-sm font-normal">Resources</h3>
<div class="flex flex-col gap-2">
@for (attachment of attachments(); track attachment.uid; let i = $index) {
<a
[href]="'/api/meetings/' + meeting().uid + '/attachments/' + attachment.uid"
[href]="attachment.type === 'link' ? attachment.link : '/api/meetings/' + meeting().uid + '/attachments/' + attachment.uid"
target="_blank"
rel="noopener noreferrer"
class="bg-gray-200 hover:bg-gray-300 rounded px-3 py-2 flex items-center gap-3 min-w-[180px] transition-colors cursor-pointer"
[attr.data-testid]="'meeting-attachment-' + i">
<!-- File Icon -->
<i [class]="(attachment.mime_type || '' | fileTypeIcon) + ' text-3xl text-black'"></i>

<!-- File Name -->
<!-- Icon - File or Link -->
@if (attachment.type === 'link') {
<i class="fa-light fa-arrow-up-right-from-square text-3xl text-black w-8 flex-shrink-0"></i>
} @else {
<i [class]="(attachment.mime_type || '' | fileTypeIcon) + ' text-3xl text-black w-8 flex-shrink-0'"></i>
}

<!-- Attachment Name -->
<span class="text-sm text-neutral-950 overflow-ellipsis overflow-hidden whitespace-nowrap flex-1 font-sans">{{ attachment.name }}</span>
</a>
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,7 @@ import { MeetingRegistrantsComponent } from '@components/meeting-registrants/mee
import { MeetingRsvpDetailsComponent } from '@components/meeting-rsvp-details/meeting-rsvp-details.component';
import { RsvpButtonGroupComponent } from '@components/rsvp-button-group/rsvp-button-group.component';
import { environment } from '@environments/environment';
import {
canJoinMeeting,
extractUrlsWithDomains,
getCurrentOrNextOccurrence,
Meeting,
MeetingAttachment,
MeetingOccurrence,
Project,
User,
} from '@lfx-one/shared';
import { canJoinMeeting, getCurrentOrNextOccurrence, Meeting, MeetingAttachment, MeetingOccurrence, Project, User } from '@lfx-one/shared';
import { FileTypeIconPipe } from '@pipes/file-type-icon.pipe';
import { MeetingTimePipe } from '@pipes/meeting-time.pipe';
import { MeetingService } from '@services/meeting.service';
Expand Down Expand Up @@ -78,7 +69,6 @@ export class MeetingJoinComponent {
public meeting: Signal<Meeting & { project: Project }>;
public currentOccurrence: Signal<MeetingOccurrence | null>;
public meetingTypeBadge: Signal<{ badgeClass: string; icon?: string; text: string } | null>;
public importantLinks: Signal<{ url: string; domain: string }[]>;
public returnTo: Signal<string | undefined>;
public password: WritableSignal<string | null> = signal<string | null>(null);
public canJoinMeeting: Signal<boolean>;
Expand All @@ -103,7 +93,6 @@ export class MeetingJoinComponent {
this.joinForm = this.initializeJoinForm();
this.formValues = this.initializeFormValues();
this.meetingTypeBadge = this.initializeMeetingTypeBadge();
this.importantLinks = this.initializeImportantLinks();
this.returnTo = this.initializeReturnTo();
this.canJoinMeeting = this.initializeCanJoinMeeting();
this.fetchedJoinUrl = this.initializeFetchedJoinUrl();
Expand Down Expand Up @@ -268,20 +257,6 @@ export class MeetingJoinComponent {
});
}

private initializeImportantLinks(): Signal<{ url: string; domain: string }[]> {
return computed(() => {
const meeting = this.meeting();
const currentOccurrence = this.currentOccurrence();

// Use current occurrence description if available, otherwise fallback to meeting description
const description = currentOccurrence?.description || meeting?.description;
if (!description) {
return [];
}
return extractUrlsWithDomains(description);
});
}

private initializeReturnTo(): Signal<string | undefined> {
return computed(() => {
return `${environment.urls.home}/meetings/${this.meeting().uid}?password=${this.password()}`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<a
[routerLink]="['/project', project()?.slug, 'meetings', upcomingMeeting()!.uid]"
class="text-sm font-medium text-primary hover:text-primary-600 hover:underline line-clamp-2"
[title]="upcomingMeeting()!.title || 'Meeting'">
[pTooltip]="upcomingMeeting()!.title || 'Meeting'">
{{ upcomingMeeting()!.title || 'Meeting' }}
</a>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ <h3 class="text-sm font-display text-gray-500">Upcoming Meetings</h3>
<ng-template #body let-row>
<tr>
<td class="w-1/2 max-w-0">
<a class="block truncate text-sm" [title]="row.title" [routerLink]="[row.url]" [relativeTo]="activatedRoute">{{ row.title }}</a>
<a class="block truncate text-sm" [pTooltip]="row.title" [routerLink]="[row.url]" [relativeTo]="activatedRoute">{{ row.title }}</a>
</td>
<td class="w-1/2">
<div class="flex justify-end whitespace-nowrap">
Expand Down Expand Up @@ -242,7 +242,7 @@ <h3 class="text-sm font-display text-gray-500">Recently Updated Committees</h3>
<ng-template #body let-row>
<tr>
<td class="w-1/2 max-w-0">
<a class="block truncate text-sm" [title]="row.title" [routerLink]="row.url">{{ row.title }}</a>
<a class="block truncate text-sm" [pTooltip]="row.title" [routerLink]="row.url">{{ row.title }}</a>
</td>
<td class="w-1/2">
<div class="flex justify-end whitespace-nowrap">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,11 @@ <h1 class="text-xl font-semibold text-slate-900" data-testid="meeting-manage-tit
[existingAttachments]="attachments()"
[isEditMode]="isEditMode()"
[deletingAttachmentId]="deletingAttachmentId()"
[pendingAttachmentDeletions]="pendingAttachmentDeletions()"
(goToStep)="goToStep($event)"
(deleteAttachment)="deleteAttachment($event)">
(deleteAttachment)="deleteAttachment($event)"
(undoDeleteAttachment)="undoDeleteAttachment($event)"
(deleteLinkAttachment)="deleteLinkAttachment($event)">
</lfx-meeting-resources-summary>
</ng-template>
</p-step-panel>
Expand Down Expand Up @@ -114,8 +117,10 @@ <h2 class="text-lg font-semibold text-slate-900 mb-4">Resources & Summary</h2>
[existingAttachments]="attachments()"
[isEditMode]="isEditMode()"
[deletingAttachmentId]="deletingAttachmentId()"
[pendingAttachmentDeletions]="pendingAttachmentDeletions()"
(goToStep)="goToStep($event)"
(deleteAttachment)="deleteAttachment($event)">
(deleteAttachment)="deleteAttachment($event)"
(undoDeleteAttachment)="undoDeleteAttachment($event)">
</lfx-meeting-resources-summary>
</div>
</div>
Expand Down
Loading