Merge pull request #1124 from AletheiaFact/stage

Production Release

.github/workflows/aws.yml

@@ -187,7 +187,7 @@ jobs:
           sed -i "s/TAG/$GITHUB_SHA/" deployment/websocket.yml
 
       - name: Applying Kubernetes Deployment
-        uses: giovannirossini/aws-eks@v1
+        uses: giovannirossini/aws-eks@v1.0.1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -196,7 +196,7 @@ jobs:
           command: kubectl apply -f ./deployment/
 
       - name: Validation
-        uses: giovannirossini/aws-eks@v1
+        uses: giovannirossini/aws-eks@v1.0.1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -206,7 +206,7 @@ jobs:
         if: success()
 
       - name: Rollback
-        uses: giovannirossini/aws-eks@v1
+        uses: giovannirossini/aws-eks@v1.0.1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/nodejs.yml

@@ -98,7 +98,9 @@ jobs:
         path: dist
     - name: List contents of aletheia-dist
       run: ls -lah /home/runner/work/aletheia/aletheia
-    - run: yarn install
+    - run: |
+        echo '{"CI_ORY_USER_PASSWORD": "${{ env.CI_ORY_USER_PASSWORD }}"}' > ./cypress.env.json
+        yarn install
     - name: Cypress run
       uses: cypress-io/github-action@v6
       with:

.gitignore

@@ -5,6 +5,7 @@
 
 # testing
 /coverage
+/cypress.env.json
 
 # production
 /build

cypress/e2e/tests/review.cy.ts

@@ -87,12 +87,16 @@ describe("Test claim review", () => {
         cy.get(locators.claimReview.BTN_FINISH_REPORT)
             .should("be.enabled")
             .click();
-        cy.get(locators.claimReview.INPUT_REVIEWER).should("exist");
+        cy.get(locators.claimReview.BTN_SELECTED_REVIEW).should("exist");
     });
 
     it("should not be able submit after choosing assigned user as reviewer", () => {
         cy.login();
         goToClaimReviewPage();
+        cy.checkRecaptcha();
+        cy.get(locators.claimReview.BTN_SELECTED_REVIEW)
+            .should("exist")
+            .click();
         cy.get(locators.claimReview.INPUT_REVIEWER)
             .should("exist")
             .type(review.username, { delay: 200 });

cypress/fixtures/user.ts

@@ -1,6 +1,6 @@
 const user = {
     email: "[email protected]",
-    password: "TEST_USER_PASS",
+    password: Cypress.env("CI_ORY_USER_PASSWORD"),
 };
 
 export default user;

cypress/support/locators.ts

@@ -54,8 +54,9 @@ const locators = {
         INPUT_CLASSIFICATION: "[data-cy=testClassificationText]",
         INPUT_REVIEWER: "[data-cy=testClaimReviewreviewerId]",
         BTN_SAVE_DRAFT: "[data-cy=testClaimReviewSAVE_DRAFT]",
-        BTN_SUBMIT: "[data-cy=testClaimReviewSUBMIT]",
+        BTN_SUBMIT: "[data-cy=testClaimReviewSEND_TO_REVIEW]",
         BTN_PUBLISH: "[data-cy=testClaimReviewPUBLISH]",
+        BTN_SELECTED_REVIEW: "[data-cy=testClaimReviewSELECTED_REVIEW]",
         TEXT_REVIEWER_ERROR: "[data-cy=testReviewerError]",
     },
 

public/locales/en/CTARegistration.json

@@ -4,5 +4,5 @@
     "Wanna be a reviewer? Aletheia is currently on Beta Test and we are accepting all journalists and fact-checking professionals to test the platform!",
     "footer":
     "Our goal is to be open for all users to add and review claims once tests are done. Keep it up with us on social media!",
-    "button": "Apply to be a reviewer"
+    "button": "Sign-up to be part of the movement"
 }

public/locales/en/home.json

@@ -6,7 +6,7 @@
     "statsClaims": "claims",
     "statsClaimReviews": "reviews",
     "statsFooter": "Contribute to an internet free of disinformation",
-    "createAccountButton": "Be a reviewer",
+    "createAccountButton": "Sign-up and be part of the Movement",
     "donateButton": "Donate to Aletheia",
     "seeMorePersonalitiesButton": "See more Personalities",
     "sectionTitle1": "Personalities",

public/locales/en/materials.json

@@ -0,0 +1,6 @@
+{
+  "title": "Supportive Materials",
+  "loggedOutMessage": "You need to login to access the supportive materials.",
+  "disclaimerFirstParagraph": "When you complete your registration, you will have access to all areas of the AletheiaFact.org platform, including complementary materials, up-to-date fact-checking reports and, of course, our complete Fact-Checking Manual. We offer totally free information and guidance so that you can fight disinformation independently and credibly.",
+  "disclaimerSecondParagraph": "To find out more about how you can become a fact-checker and publish your reports on the platform, contributing to the Movement on a voluntary basis, please contact us at"
+}

public/locales/en/menu.json

@@ -10,5 +10,7 @@
     "personalityItem": "Personalities",
     "claimItem": "Claims",
     "kanbanItem": "Kanban",
-    "nameSpaceItem": "Namespace"
+    "nameSpaceItem": "Namespace",
+    "supportiveMaterials": "Supportive Materials"
+
 }

public/locales/pt/CTARegistration.json

@@ -4,5 +4,5 @@
     "Aletheia está atualmente em teste beta e estamos aceitando todos os jornalistas e profissionais de checagem de fatos para testar a plataforma!",
     "footer":
     "Nosso objetivo é estar aberto para que todos os usuários adicionem e revisem alegações assim que os testes forem concluídos. Acompanhe-nos nas redes sociais!",
-    "button": "Inscreva-se para ser um revisor"
+    "button": "Inscreva-se para ser parte do movimento"
 }

public/locales/pt/home.json

@@ -6,7 +6,7 @@
     "statsClaims": "discursos",
     "statsClaimReviews": "checagens",
     "statsFooter": "Contribua para uma internet livre de desinformação",
-    "createAccountButton": "Seja um revisor",
+    "createAccountButton": "Cadastre-se e faça parte do Movimento",
     "donateButton": "Doe para Aletheia",
     "seeMorePersonalitiesButton": "Veja mais personalidades",
     "sectionTitle1": "Personalidades",

public/locales/pt/materials.json

@@ -0,0 +1,7 @@
+{
+  "title": "Materiais de Apoio",
+  "loggedOutMessage": "Para acessar os materias de apoio é preciso ter uma conta na plataforma.",
+  "disclaimerFirstParagraph": "Ao finalizar o seu cadastro, você terá acesso a todas as áreas da plataforma AletheiaFact.org, incluindo materiais complementares, relatórios de checagem atualizados e, é claro, ao nosso Manual de Checagem completo. Oferecemos informações e orientações totalmente gratuitas para que você combata a desinformação de forma autônoma e com credibilidade.",
+  "disclaimerSecondParagraph": "Para saber mais sobre como você pode se tornar um checador de fatos e publicar seus relatórios na plataforma, contribuindo para o Movimento de forma voluntária, entre em contato conosco pelo e-mail:"
+
+}

public/locales/pt/menu.json

@@ -10,5 +10,6 @@
     "personalityItem": "Personalidades",
     "claimItem": "Afirmações",
     "kanbanItem": "Kanban",
-    "nameSpaceItem": "Namespace"
+    "nameSpaceItem": "Namespace",
+    "supportiveMaterials": "Materiais de Apoio"
 }

server/claim-review-task/claim-review-task.controller.ts

@@ -163,6 +163,7 @@ export class ClaimReviewController {
     public async personalityList(@Req() req: Request, @Res() res: Response) {
         const parsedUrl = parse(req.url, true);
         const enableCollaborativeEditor = this.isEnableCollaborativeEditor();
+        const enableEditorAnnotations = this.isEnableEditorAnnotations();
 
         await this.viewService.getNextServer().render(
             req,
@@ -171,6 +172,7 @@ export class ClaimReviewController {
             Object.assign(parsedUrl.query, {
                 sitekey: this.configService.get<string>("recaptcha_sitekey"),
                 enableCollaborativeEditor,
+                enableEditorAnnotations,
                 websocketUrl: this.configService.get<string>("websocketUrl"),
                 nameSpace: req.params.namespace,
             })
@@ -184,4 +186,12 @@ export class ClaimReviewController {
             ? this.unleash.isEnabled("enable_collaborative_editor")
             : false;
     }
+
+    private isEnableEditorAnnotations() {
+        const config = this.configService.get<string>("feature_flag");
+
+        return config
+            ? this.unleash.isEnabled("enable_editor_annotations")
+            : false;
+    }
 }

server/claim-review-task/mongo-utils.ts

@@ -1,4 +1,12 @@
 export const getQueryMatchForMachineValue = (value) => {
+    if (value === "cross-checking") {
+        return {
+            "machine.value": {
+                $in: ["cross-checking", "addCommentCrossChecking"],
+            },
+        };
+    }
+
     return plainValues.includes(value)
         ? { "machine.value": value }
         : { [`machine.value.${value}`]: { $exists: true } };

server/claim/claim.controller.ts

@@ -132,6 +132,7 @@ export class ClaimController {
                 ? `/personality/${personality.slug}/claim/${claim.slug}`
                 : `/personality/${personality.slug}`;
             return {
+                _id: claim._id,
                 title: claim.title,
                 path:
                     claim.nameSpace !== NameSpaceEnum.Main
@@ -147,9 +148,6 @@ export class ClaimController {
     @ApiTags("claim")
     @Post("api/claim/image")
     async createClaimImage(@Body() createClaimDTO) {
-        if (!this.isEnabledImageClaim()) {
-            throw new NotFoundException();
-        }
         try {
             const claim = await this._createClaim(createClaimDTO);
 
@@ -333,6 +331,7 @@ export class ClaimController {
         }
 
         const enableCollaborativeEditor = this.isEnableCollaborativeEditor();
+        const enableEditorAnnotations = this.isEnableEditorAnnotations();
 
         hideDescriptions[TargetModel.Claim] =
             await this.historyService.getDescriptionForHide(
@@ -361,6 +360,7 @@ export class ClaimController {
                 sitekey: this.configService.get<string>("recaptcha_sitekey"),
                 hideDescriptions,
                 enableCollaborativeEditor,
+                enableEditorAnnotations,
                 websocketUrl: this.configService.get<string>("websocketUrl"),
                 nameSpace: req.params.namespace,
             })
@@ -486,8 +486,6 @@ export class ClaimController {
     ) {
         const parsedUrl = parse(req.url, true);
 
-        const enableImageClaim = this.isEnabledImageClaim();
-
         const personality = query.personality
             ? await this.personalityService.getClaimsByPersonalitySlug(
                   {
@@ -505,7 +503,6 @@ export class ClaimController {
             Object.assign(parsedUrl.query, {
                 personality,
                 sitekey: this.configService.get<string>("recaptcha_sitekey"),
-                enableImageClaim,
                 nameSpace: req.params.namespace,
             })
         );
@@ -519,10 +516,6 @@ export class ClaimController {
         @Req() req: BaseRequest,
         @Res() res: Response
     ) {
-        if (!this.isEnabledImageClaim()) {
-            throw new NotFoundException();
-        }
-
         const parsedUrl = parse(req.url, true);
 
         await this.viewService.getNextServer().render(
@@ -548,13 +541,7 @@ export class ClaimController {
             namespace as NameSpaceEnum
         );
         const enableCollaborativeEditor = this.isEnableCollaborativeEditor();
-
-        if (
-            claim.contentModel === ContentModelEnum.Image &&
-            !this.isEnabledImageClaim()
-        ) {
-            throw new NotFoundException();
-        }
+        const enableEditorAnnotations = this.isEnableEditorAnnotations();
 
         if (claim.personalities.length > 0) {
             const personalitySlug = slugify(claim.personalities[0].name, {
@@ -575,6 +562,7 @@ export class ClaimController {
                 claim,
                 sitekey: this.configService.get<string>("recaptcha_sitekey"),
                 enableCollaborativeEditor,
+                enableEditorAnnotations,
                 websocketUrl: this.configService.get<string>("websocketUrl"),
                 nameSpace: namespace,
             })
@@ -594,6 +582,7 @@ export class ClaimController {
         const parsedUrl = parse(req.url, true);
 
         const enableCollaborativeEditor = this.isEnableCollaborativeEditor();
+        const enableEditorAnnotations = this.isEnableEditorAnnotations();
 
         const personality =
             await this.personalityService.getClaimsByPersonalitySlug(
@@ -624,6 +613,7 @@ export class ClaimController {
                 claim,
                 sitekey: this.configService.get<string>("recaptcha_sitekey"),
                 enableCollaborativeEditor,
+                enableEditorAnnotations,
                 websocketUrl: this.configService.get<string>("websocketUrl"),
                 hideDescriptions,
                 nameSpace: namespace,
@@ -650,6 +640,7 @@ export class ClaimController {
             );
 
         const enableCollaborativeEditor = this.isEnableCollaborativeEditor();
+        const enableEditorAnnotations = this.isEnableEditorAnnotations();
 
         const claim = await this.claimService.getByPersonalityIdAndClaimSlug(
             personality._id,
@@ -665,6 +656,7 @@ export class ClaimController {
                 personality,
                 claim,
                 enableCollaborativeEditor,
+                enableEditorAnnotations,
                 websocketUrl: this.configService.get<string>("websocketUrl"),
                 nameSpace: namespace,
             })
@@ -798,17 +790,19 @@ export class ClaimController {
         );
     }
 
-    private isEnabledImageClaim() {
+    private isEnableCollaborativeEditor() {
         const config = this.configService.get<string>("feature_flag");
 
-        return config ? this.unleash.isEnabled("enable_image_claim") : false;
+        return config
+            ? this.unleash.isEnabled("enable_collaborative_editor")
+            : false;
     }
 
-    private isEnableCollaborativeEditor() {
+    private isEnableEditorAnnotations() {
         const config = this.configService.get<string>("feature_flag");
 
         return config
-            ? this.unleash.isEnabled("enable_collaborative_editor")
+            ? this.unleash.isEnabled("enable_editor_annotations")
             : false;
     }
 }

server/claim/claim.service.ts

@@ -52,8 +52,8 @@ export class ClaimService {
 
         const claims = await this.ClaimModel.find(query)
             .populate("latestRevision")
-            .skip(page * pageSize)
-            .limit(pageSize)
+            .skip(page * parseInt(pageSize, 10))
+            .limit(parseInt(pageSize, 10))
             .sort({ _id: order })
             .lean();
 

server/claim/dto/create-claim.dto.ts

@@ -17,7 +17,6 @@ export class CreateClaimDTO {
     title: string;
 
     @IsNotEmpty()
-    @IsString()
     @ApiProperty()
     content: string;