Merge pull request #491 from sinfo/lucas-ci

Draft: CI

Author: Francisca105

.github/workflows/lint.yml

@@ -0,0 +1,35 @@
+name: Lint and Format on PR
+
+on:
+  pull_request:
+
+jobs:
+  frontend-lint:
+    name: Frontend ESLint & Prettier
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "23"
+          cache: "npm"
+          cache-dependency-path: frontend/package-lock.json
+
+      - name: Install frontend dependencies
+        working-directory: frontend
+        run: npm ci
+
+      - name: Run ESLint (auto-fix)
+        working-directory: frontend
+        run: npm run lint
+
+      - name: Run Prettier check
+        working-directory: frontend
+        run: npx prettier --check .
+
+      - name: Build frontend
+        working-directory: frontend
+        run: npm run build

frontend/package.json

@@ -61,6 +61,5 @@
       "npx --yes eslint --ext .ts,.vue,.js,.json --fix",
       "npx --yes prettier --write"
     ]
-  },
-  "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
+  }
 }

frontend/src/components/BulkEmailDialogTrigger.vue

@@ -492,24 +492,83 @@ const showNoMemberContactWarning = computed(() => {
   return !hasMail || !hasPhone;
 });
 
-// Use the appropriate composable based on entity type
-const bulkEmailComposable =
+// We MUST separate the composable usages here, otherwise TypeScript infers incompatible types.
+const companyBulk = useBulkCompanyEmails();
+const speakerBulk = useBulkSpeakerEmails();
+
+const processBulkEmails = async (
+  templateCategory: EmailTemplateCategory,
+  statuses: ParticipationStatus[],
+  entities: CompanyWithParticipation[] | SpeakerWithParticipation[],
+) => {
+  if (props.entityType === "companies") {
+    return companyBulk.processBulkEmails(
+      templateCategory,
+      statuses,
+      entities as CompanyWithParticipation[],
+    );
+  }
+  return speakerBulk.processBulkEmails(
+    templateCategory,
+    statuses,
+    entities as SpeakerWithParticipation[],
+  );
+};
+
+const sendProcessedEmails = async () => {
+  if (props.entityType === "companies") {
+    return companyBulk.sendProcessedEmails();
+  }
+  return speakerBulk.sendProcessedEmails();
+};
+
+const isProcessing = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.isProcessing.value
+    : speakerBulk.isProcessing.value,
+);
+
+const isSending = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.isSending.value
+    : speakerBulk.isSending.value,
+);
+
+const processResult = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.processResult.value
+    : speakerBulk.processResult.value,
+);
+
+const result = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.result.value
+    : speakerBulk.result.value,
+);
+
+const processedCount = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.processedCount.value
+    : speakerBulk.processedCount.value,
+);
+
+const totalToProcess = computed(() =>
   props.entityType === "companies"
-    ? useBulkCompanyEmails()
-    : useBulkSpeakerEmails();
-
-const {
-  processBulkEmails,
-  sendProcessedEmails,
-  isProcessing,
-  isSending,
-  processResult,
-  result,
-  processedCount,
-  totalToProcess,
-  sentCount,
-  totalToSend,
-} = bulkEmailComposable;
+    ? companyBulk.totalToProcess.value
+    : speakerBulk.totalToProcess.value,
+);
+
+const sentCount = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.sentCount.value
+    : speakerBulk.sentCount.value,
+);
+
+const totalToSend = computed(() =>
+  props.entityType === "companies"
+    ? companyBulk.totalToSend.value
+    : speakerBulk.totalToSend.value,
+);
 
 const isDialogOpen = ref(false);
 const currentStep = ref(1);

frontend/src/components/Communications.vue

@@ -325,7 +325,8 @@ interface CommunicationsProps {
   fetchCommunications: (
     id: string,
   ) => Promise<{ data: ParticipationCommunications[] }>;
-  postThreadMutation?: unknown;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  postThreadMutation?: any;
 }
 
 type Author = Member | Speaker | Company;

frontend/src/components/companies/CompanyCommunications.vue

@@ -33,7 +33,7 @@ postThreadMutation.companyId.value = props.company.id;
 const templates = computed(() =>
   companyTemplates.map((it) => ({
     template: it,
-    variables: createCompanyTemplateVariables(it),
+    variables: createCompanyTemplateVariables(),
   })),
 );
 

frontend/src/composables/useBulkEmails.ts

@@ -22,7 +22,9 @@ import { isEmailValid } from "@/lib/utils";
 import { Gender, Language } from "@/dto/contacts";
 
 // Generic types for bulk emails
-type BulkEmailEntity = CompanyWithParticipation | SpeakerWithParticipation;
+export type BulkEmailEntity =
+  | CompanyWithParticipation
+  | SpeakerWithParticipation;
 function isSpeaker(
   entity: BulkEmailEntity,
 ): entity is SpeakerWithParticipation {
@@ -225,7 +227,7 @@ export const useBulkEmails = <T extends BulkEmailEntity>(
   const processBulkEmails = async (
     templateCategory: EmailTemplateCategory,
     statuses: ParticipationStatus[],
-    entities: BulkEmailEntity[],
+    entities: T[],
   ): Promise<BulkEmailProcessResult<T>> => {
     isProcessing.value = true;
     processedCount.value = 0;