Merge branch 'develop'

code4romania · Jan 19, 2024 · 23cdef7 · 23cdef7
2 parents 474ea0f + 8807a2c
commit 23cdef7
Show file tree

Hide file tree

Showing 55 changed files with 22 additions and 3,203 deletions.
diff --git a/backend/src/migrations/1705667201946-AddVideLinkOptionalInHistory.ts b/backend/src/migrations/1705667201946-AddVideLinkOptionalInHistory.ts
@@ -0,0 +1,19 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+
+export class AddVideLinkOptionalInHistory1705667201946
+  implements MigrationInterface
+{
+  name = 'AddVideLinkOptionalInHistory1705667201946';
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "application_history" ALTER COLUMN "video_link" DROP NOT NULL`,
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE "application_history" ALTER COLUMN "video_link" SET NOT NULL`,
+    );
+  }
+}
diff --git a/backend/src/modules/application/entities/application-history.entity.ts b/backend/src/modules/application/entities/application-history.entity.ts
@@ -71,7 +71,7 @@ export class ApplicationHistory
   @Column({ type: 'text', name: 'login_link', nullable: true })
   loginLink: string;
 
-  @Column({ type: 'text', name: 'video_link' })
+  @Column({ type: 'text', name: 'video_link', nullable: true })
   videoLink: string;
 
   @Column({ type: 'text', name: 'logo', nullable: true })

diff --git a/frontend/src/common/helpers/format.helper.ts b/frontend/src/common/helpers/format.helper.ts
@@ -84,12 +84,12 @@ export const mapGroupsToSelect = (item: any): ISelectData =>
   item.isNew
     ? {
         value: item.id,
-        label: item.abbreviation,
+        label: item.name,
         isNew: item.isNew,
       }
     : {
         value: item.id,
-        label: item.abbreviation,
+        label: item.name,
       };
 
 export const str2bool = (value: string) => {

diff --git a/terraform/.gitignore b/terraform/.gitignore
diff --git a/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl
diff --git a/terraform/amplify-centrucivic.tf b/terraform/amplify-centrucivic.tf
diff --git a/terraform/amplify-practice4good.tf b/terraform/amplify-practice4good.tf
diff --git a/terraform/amplify.tf b/terraform/amplify.tf
diff --git a/terraform/amplify/amplify.yml b/terraform/amplify/amplify.yml
diff --git a/terraform/app-runner.tf b/terraform/app-runner.tf