Merge remote-tracking branch 'origin/main' into prod

api/Dockerfile

@@ -7,7 +7,10 @@ RUN apk add \
     curl \
     gnupg \
     lsb-release \
-    wget
+    wget \
+    openssl \
+    openssl-dev \
+    libc6-compat
 
 # Dockerize is needed to sync containers startup
 ENV DOCKERIZE_VERSION v0.6.1

api/package.json

@@ -101,7 +101,7 @@
         "typescript": "^5.2.2"
     },
     "optionalDependencies": {
-        "swc.linux-x64-musl.node": "1.7.36"
+        "@swc/core-linux-x64-musl": "1.9.3"
     },
     "overrides": {
         "fast-xml-parser": "^4.2.5",

api/prisma/migrations/20241217135037_add_flag_categories/migration.sql

@@ -0,0 +1,11 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "PublicationFlagCategoryEnum" ADD VALUE 'UNDECLARED_AI';
+ALTER TYPE "PublicationFlagCategoryEnum" ADD VALUE 'NOT_IN_OCTOPUS_FORMAT';
+ALTER TYPE "PublicationFlagCategoryEnum" ADD VALUE 'IRRELEVANT_LINKED_PUBLICATION';

api/prisma/schema.prisma

@@ -1,7 +1,7 @@
 generator client {
     provider        = "prisma-client-js"
     previewFeatures = ["fullTextSearch"]
-    binaryTargets   = ["native", "rhel-openssl-3.0.x", "linux-arm64-openssl-3.0.x"]
+    binaryTargets   = ["native", "linux-musl", "rhel-openssl-3.0.x", "linux-arm64-openssl-3.0.x"]
 }
 
 datasource db {
@@ -354,6 +354,9 @@ enum PublicationFlagCategoryEnum {
     UNDECLARED_IMAGE_MANIPULATION
     COPYRIGHT
     INAPPROPRIATE
+    UNDECLARED_AI
+    NOT_IN_OCTOPUS_FORMAT
+    IRRELEVANT_LINKED_PUBLICATION
 }
 
 enum LicenceType {

api/src/components/flag/controller.ts

@@ -1,12 +1,13 @@
 import * as cheerio from 'cheerio';
 import nodemailer from 'nodemailer';
+
+import * as email from 'lib/email';
+import * as flagService from 'flag/service';
 import * as Helpers from 'lib/helpers';
-import * as response from 'lib/response';
+import * as I from 'interface';
 import * as publicationService from 'publication/service';
-import * as flagService from 'flag/service';
+import * as response from 'lib/response';
 import * as userService from 'user/service';
-import * as I from 'interface';
-import * as email from 'lib/email';
 
 export const get = async (event: I.APIRequest<undefined, undefined, I.GetFlagByID>): Promise<I.JSONResponse> => {
     try {
@@ -48,14 +49,19 @@ export const getUserFlags = async (
     }
 };
 
-const formatFlagType = (flagType: I.FlagCategory): string => {
-    const types = {
+const formatFlagType = (flagType: I.PublicationFlagCategoryEnum): string => {
+    const types: {
+        [key in I.PublicationFlagCategoryEnum]: string;
+    } = {
         PLAGIARISM: 'Plagiarism',
         ETHICAL_ISSUES: 'Ethical issues',
         MISREPRESENTATION: 'Misrepresentation',
         UNDECLARED_IMAGE_MANIPULATION: 'Undeclared image manipulation',
         COPYRIGHT: 'Copyright',
-        INAPPROPRIATE: 'Inappropriate'
+        INAPPROPRIATE: 'Inappropriate',
+        UNDECLARED_AI: 'Undeclared use of generative AI',
+        NOT_IN_OCTOPUS_FORMAT: 'Not in Octopus format',
+        IRRELEVANT_LINKED_PUBLICATION: 'Linked to irrelevant publication'
     };
 
     return types[flagType];

api/src/components/flag/schema/createFlag.ts

@@ -5,13 +5,16 @@ const updatedPublicationSchema: I.Schema = {
     properties: {
         category: {
             type: 'string',
-            enum: <I.FlagCategory[]>[
+            enum: <I.PublicationFlagCategoryEnum[]>[
                 'PLAGIARISM',
                 'ETHICAL_ISSUES',
                 'MISREPRESENTATION',
                 'UNDECLARED_IMAGE_MANIPULATION',
                 'COPYRIGHT',
-                'INAPPROPRIATE'
+                'INAPPROPRIATE',
+                'UNDECLARED_AI',
+                'NOT_IN_OCTOPUS_FORMAT',
+                'IRRELEVANT_LINKED_PUBLICATION'
             ]
         },
         comment: {

api/src/lib/interface.ts

@@ -349,14 +349,6 @@ export interface ConfirmVerificationCodeBody {
 const prismaGeneratedFlagType = Prisma.validator<Prisma.PublicationFlagsDefaultArgs>()({});
 export type Flag = Prisma.PublicationFlagsGetPayload<typeof prismaGeneratedFlagType>;
 
-export type FlagCategory =
-    | 'PLAGIARISM'
-    | 'ETHICAL_ISSUES'
-    | 'MISREPRESENTATION'
-    | 'UNDECLARED_IMAGE_MANIPULATION'
-    | 'COPYRIGHT'
-    | 'INAPPROPRIATE';
-
 export interface CreateFlagPathParams {
     publicationId: string;
 }

infra/modules/oidc/main.tf

@@ -60,6 +60,7 @@ data "aws_iam_policy_document" "deploy_backend_policy" {
       "iam:GetRole",
       "iam:GetInstanceProfile",
       "iam:PassRole",
+      "iam:PutRolePolicy",
       "kms:CreateGrant",
       "kms:Decrypt",
       "kms:DescribeKey",

ui/src/config/values.ts

@@ -856,6 +856,18 @@ export const octopusInformation: Interfaces.OctopusInformation = {
         INAPPROPRIATE: {
             value: 'INAPPROPRIATE',
             nicename: 'Inappropriate'
+        },
+        UNDECLARED_AI: {
+            value: 'UNDECLARED_AI',
+            nicename: 'Undeclared use of generative AI'
+        },
+        NOT_IN_OCTOPUS_FORMAT: {
+            value: 'NOT_IN_OCTOPUS_FORMAT',
+            nicename: 'Not in Octopus format'
+        },
+        IRRELEVANT_LINKED_PUBLICATION: {
+            value: 'IRRELEVANT_LINKED_PUBLICATION',
+            nicename: 'Linked to irrelevant publication'
         }
     }
 };

ui/src/lib/types.ts

@@ -112,7 +112,10 @@ export type RedFlagTypes =
     | 'MISREPRESENTATION'
     | 'UNDECLARED_IMAGE_MANIPULATION'
     | 'COPYRIGHT'
-    | 'INAPPROPRIATE';
+    | 'INAPPROPRIATE'
+    | 'UNDECLARED_AI'
+    | 'NOT_IN_OCTOPUS_FORMAT'
+    | 'IRRELEVANT_LINKED_PUBLICATION';
 
 export type Languages =
     | 'ab'