Merge branch 'dev' into unicron-rewrite-py2go

Assisted by [OpenAI](https://platform.openai.com/)

Assisted by [GitHub Copilot](https://github.com/features/copilot)

Author: lukaszgryglicki

tests/functional/cypress/e2e/v4/signatures.cy.ts

@@ -45,6 +45,7 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
 
   let signatureIclaID = '';
   let signatureCclaID = '';
+  let projectCompanySignatureID = '';
   let signatureID = '';
   let signatureApproved = true;
   let allowFail: boolean = !(Cypress.env('ALLOW_FAIL') === 1);
@@ -72,10 +73,21 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
       },
     });
 
-  const findProjectCompanySignature = (signatures: any[]) =>
-    signatures.find((item: any) => item.signatureID === signatureCclaID) || signatures[0];
+  const findProjectCompanySignature = (signatures: any[], signatureID?: string) =>
+    signatures.find((item: any) => item.signatureID === signatureID) || signatures[0];
+
+  const extractApprovalValues = (list: any[] = []) =>
+    list
+      .map((item: any) => {
+        if (typeof item === 'string') {
+          return item;
+        }
+        return item?.approvalItem || item?.approval_item;
+      })
+      .filter(Boolean);
 
   const waitForDomainApprovalListState = (
+    signatureID: string,
     domain: string,
     shouldExist: boolean,
     retries: number = 6,
@@ -84,11 +96,11 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
       getProjectCompanySignatures().then((response) => {
         validate_200_Status(response);
         const signatures = response.body.signatures || [];
-        const signature = findProjectCompanySignature(signatures);
+        const signature = findProjectCompanySignature(signatures, signatureID);
 
-        expect(signature, `CCLA signature ${signatureCclaID} should exist`).to.exist;
+        expect(signature, `CCLA signature ${signatureID} should exist`).to.exist;
 
-        const list = signature.domainApprovalList || [];
+        const list = extractApprovalValues(signature.domainApprovalList || []);
         const isPresent = list.includes(domain);
 
         if (isPresent === shouldExist) {
@@ -416,6 +428,9 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
         expect(signatures[i].companyName).to.eql(companyName);
         expect(signatures[i].claType).to.eql('ccla');
       }
+      if (!projectCompanySignatureID && signatures.length > 0) {
+        projectCompanySignatureID = signatures[0].signatureID;
+      }
       validateApiResponse('signatures/getProjectCompanySignatures.json', response);
     });
   });
@@ -835,7 +850,8 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
       return cy.logJson('response', response).then(() => {
         validate_200_Status(response);
         cy.task('log', 'domain ' + domainApprovalList + ' should be added to approval list');
-        return waitForDomainApprovalListState(domainApprovalList, true);
+        projectCompanySignatureID = response.body.signatureID || projectCompanySignatureID;
+        return waitForDomainApprovalListState(projectCompanySignatureID, domainApprovalList, true);
       });
     });
   });
@@ -857,7 +873,8 @@ describe('To Validate & get list of signatures of ClaGroups via API call', funct
       return cy.logJson('response', response).then(() => {
         validate_200_Status(response);
         cy.task('log', 'domain ' + domainApprovalList + ' should be removed from approval list');
-        return waitForDomainApprovalListState(domainApprovalList, false);
+        projectCompanySignatureID = response.body.signatureID || projectCompanySignatureID;
+        return waitForDomainApprovalListState(projectCompanySignatureID, domainApprovalList, false);
       });
     });
   });