Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.1.1 #603

Merged
merged 82 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from 80 commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
0fe8abf
Change NGO HUb typo (#503)
tudoramariei Jul 2, 2024
6a78efa
FE Libraries version bump (#521)
dragos1195 Jul 4, 2024
76ff727
Bump Versions and fix related issues (#502)
radulescuandrew Jul 4, 2024
6c82ac7
wip: fix broken cache manager
radulescuandrew Jul 5, 2024
84c0258
Set fixed backend versions, change cache-manager lib
radulescuandrew Jul 5, 2024
51ed8fa
Increase BE version for testing purpose
radulescuandrew Jul 5, 2024
4fae275
fix: [436] working version to prevent the blocking scenario
dragos1195 Jul 8, 2024
05c0a29
fix: [436] also fix the 322 bug
dragos1195 Jul 8, 2024
d602fdf
Feat/485 - Send notification on app request (#541)
radulescuandrew Jul 9, 2024
70fc5ff
Feat/474 (#546)
dragos1195 Jul 9, 2024
9a4d7d2
fix: [436] add sentry reminder
dragos1195 Jul 9, 2024
3c9635b
Merge pull request #538 from code4romania/fix/436
dragos1195 Jul 9, 2024
4f3f8e0
fix 509: navigate back to applications when app req returns an error
luciatugui Jul 10, 2024
36af3e9
Merge pull request #554 from code4romania/fix/509-white-screen
luciatugui Jul 10, 2024
8f369ce
fix 514: remove click on user row for superadmin
luciatugui Jul 10, 2024
be7feb0
Merge branch 'develop' into fix/514-user-redirect
luciatugui Jul 10, 2024
fb0980a
feat: allow rich text formatting for extended description
luciatugui Jul 11, 2024
43a2c9b
fix: add back white background for feedback card
luciatugui Jul 11, 2024
b03c9d0
fix: allow videos from youtube to be embedded in app details
luciatugui Jul 11, 2024
421401a
Merge pull request #563 from code4romania/feat/rich-text-formatting
luciatugui Jul 11, 2024
3ac7ea2
Merge pull request #564 from code4romania/fix/512-presentation-videos
luciatugui Jul 11, 2024
e6a861d
infra: setup version and tag at build time (#565)
radulescuandrew Jul 11, 2024
bb6435d
Remove junk
radulescuandrew Jul 11, 2024
3328d33
ci: add context to git action
radulescuandrew Jul 11, 2024
ff3aca7
fix: url for activity report
luciatugui Jul 11, 2024
14baeb9
Merge branch 'develop' into fix/507-wrong-redirect
luciatugui Jul 11, 2024
a2511e2
fix: save button not working on informatii legale tab
luciatugui Jul 11, 2024
a2d45b6
Change version endpoint structure
radulescuandrew Jul 11, 2024
3638af8
fix: hide same address checkbox in readonly mode + display '-' when n…
luciatugui Jul 11, 2024
876d235
fix: [468] add phone number input to accommodate international phone …
dragos1195 Jul 11, 2024
a237a1b
fix: financial data error translations
luciatugui Jul 11, 2024
3b7f9c9
fix: ro translation
luciatugui Jul 11, 2024
c96126d
Merge pull request #573 from code4romania/fix/511-financial-data
luciatugui Jul 12, 2024
2c59726
Merge pull request #570 from code4romania/fix/504-hide-same-address
luciatugui Jul 12, 2024
2bc99fb
Merge pull request #568 from code4romania/fix/505-save-button
luciatugui Jul 12, 2024
be181a5
Merge pull request #567 from code4romania/fix/507-wrong-redirect
luciatugui Jul 12, 2024
54c9066
Merge pull request #572 from code4romania/fix/468
dragos1195 Jul 12, 2024
826682f
fix: [475] remove backend min length for app description
dragos1195 Jul 12, 2024
82694bc
fix [510]: dateRangePicker styling
luciatugui Jul 12, 2024
98371d1
Merge pull request #575 from code4romania/fix/475-be
dragos1195 Jul 12, 2024
8fe93ef
fix [481]: don't allow organization tabs to spread on two rows
luciatugui Jul 12, 2024
1d2c17f
Merge branch 'develop' of github.com:code4romania/onghub into develop
luciatugui Jul 12, 2024
174f25a
fix: [468] fix comments
dragos1195 Jul 12, 2024
540a1d1
wip: table loader
luciatugui Jul 12, 2024
b383545
fi: table-loader
luciatugui Jul 15, 2024
0fb90a4
fix: [468] added checks for directors and legal representative
dragos1195 Jul 15, 2024
e8712a6
fix: [468-1] add version constant
dragos1195 Jul 15, 2024
16bdfb3
Merge pull request #580 from code4romania/fix/468-1
dragos1195 Jul 15, 2024
0935ab4
Merge branch 'main' into develop
dragos1195 Jul 18, 2024
dcb4b2b
fix: [582] remove required phone validation + fix 585 + add updated p…
dragos1195 Jul 18, 2024
250c4cd
Merge pull request #586 from code4romania/fix/582
dragos1195 Jul 18, 2024
78c075d
feat: [589] wip non political affiliation file
dragos1195 Jul 19, 2024
7fc230c
feat: [589] add balance sheet and non political affiliation files
dragos1195 Jul 22, 2024
52716f6
feat: [589] add translations and "no document" text
dragos1195 Jul 23, 2024
59d501b
feat: [589] add correct translations
dragos1195 Jul 23, 2024
8f5e020
Merge branch 'develop' into feature/589
dragos1195 Jul 23, 2024
2c5b5b7
feat: [589] add const back
dragos1195 Jul 23, 2024
383673d
feat: [589] fix comm
dragos1195 Jul 23, 2024
e4b31b8
feat: allow SuperAdmins to view all users
radulescuandrew Jul 24, 2024
a492756
Merge pull request #593 from code4romania/feat/493
radulescuandrew Jul 24, 2024
3e12d76
feat: [589] add errors, sentry + fix wrong property
dragos1195 Jul 24, 2024
57e56dd
Merge pull request #592 from code4romania/feature/589
dragos1195 Jul 24, 2024
47a6cd9
feat: [590] wip work on adding the fields
dragos1195 Jul 24, 2024
e5312ee
feat: [590] add issuer table, migration and seed + adjustments for t…
dragos1195 Jul 25, 2024
db99a18
feat: [589] fix errors
dragos1195 Jul 25, 2024
38cc892
Merge pull request #594 from code4romania/feat/589-1
dragos1195 Jul 26, 2024
3836c2e
feat: [590] wip new fields
dragos1195 Jul 26, 2024
bc64971
fix: [develop] add correct translations for errors
dragos1195 Jul 26, 2024
ac931ca
feat: [590] fix the migrations
dragos1195 Jul 26, 2024
5d4ca7a
feat: [590] fix comments
dragos1195 Jul 29, 2024
509fc60
Merge pull request #596 from code4romania/feature/590
dragos1195 Jul 29, 2024
31c5093
feat: [590] add fix for requests
dragos1195 Jul 30, 2024
a40236e
feat: [590-fix] fix comments
dragos1195 Jul 30, 2024
2825b52
Merge pull request #598 from code4romania/feature/590-fix
dragos1195 Jul 30, 2024
dde46f7
fix: [520] add sectors
dragos1195 Jul 30, 2024
bdd7362
Merge pull request #599 from code4romania/fix/520
dragos1195 Jul 31, 2024
0d55b53
feat: [590] add role for contact entity
dragos1195 Jul 31, 2024
64ac077
Merge pull request #601 from code4romania/feature/590-role
dragos1195 Jul 31, 2024
cbbe074
feat: [590] fix create with others + fix create with legal rep with role
dragos1195 Aug 1, 2024
4fead5c
Merge pull request #602 from code4romania/feature/590-role-fix
dragos1195 Aug 1, 2024
309a809
fix: add wrap on legal representative on create organization legal
dragos1195 Aug 5, 2024
230832a
Merge pull request #604 from code4romania/fix/fields-legal-rep
dragos1195 Aug 5, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class BalanceSheetAndNonPoliticalAffiliation1721632351165
implements MigrationInterface
{
name = 'BalanceSheetAndNonPoliticalAffiliation1721632351165';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "organization_legal" ADD "balance_sheet_file" character varying`,
);
await queryRunner.query(
`ALTER TABLE "organization_legal" ADD "non_political_affiliation_file" character varying`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "organization_legal" DROP COLUMN "non_political_affiliation_file"`,
);
await queryRunner.query(
`ALTER TABLE "organization_legal" DROP COLUMN "balance_sheet_file"`,
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddOrganizationAliasToUserApplicationsView1721741119685
implements MigrationInterface
{
name = 'AddOrganizationAliasToUserApplicationsView1721741119685';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`DELETE FROM "typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
['VIEW', 'UserApplicationsView', 'public'],
);
await queryRunner.query(`DROP VIEW "UserApplicationsView"`);
await queryRunner.query(`CREATE VIEW "UserApplicationsView" AS
SELECT u.id,
u.name,
u.email,
u.phone,
u.status,
u.role,
u.organization_id AS "organizationId",
u.created_on AS "createdOn",
u.updated_on AS "updatedOn",
og.alias as "organizationAlias",
array_agg(DISTINCT a.id) AS "availableAppsIDs",
json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS "availableApps"
FROM "user" u
LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum
LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum
LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum
LEFT JOIN organization o ON u.organization_id = o.id
LEFT JOIN organization_general og ON o.organization_general_id = og.id
WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL
GROUP BY u.id, og.alias;

`);
await queryRunner.query(
`INSERT INTO "typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
[
'public',
'VIEW',
'UserApplicationsView',
"SELECT u.id,\n u.name,\n u.email,\n u.phone,\n u.status,\n u.role,\n u.organization_id AS \"organizationId\",\n u.created_on AS \"createdOn\",\n u.updated_on AS \"updatedOn\",\n og.alias as \"organizationAlias\",\n array_agg(DISTINCT a.id) AS \"availableAppsIDs\",\n json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS \"availableApps\"\n FROM \"user\" u\n LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum\n LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum\n LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum\n LEFT JOIN organization o ON u.organization_id = o.id\n LEFT JOIN organization_general og ON o.organization_general_id = og.id\n WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL\n GROUP BY u.id, og.alias;",
],
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`DELETE FROM "typeorm_metadata" WHERE "type" = $1 AND "name" = $2 AND "schema" = $3`,
['VIEW', 'UserApplicationsView', 'public'],
);
await queryRunner.query(`DROP VIEW "UserApplicationsView"`);
await queryRunner.query(`CREATE VIEW "UserApplicationsView" AS SELECT u.id,
u.name,
u.email,
u.phone,
u.status,
u.role,
u.organization_id AS "organizationId",
u.created_on AS "createdOn",
u.updated_on AS "updatedOn",
og.alias,
array_agg(DISTINCT a.id) AS "availableAppsIDs",
json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS "availableApps"
FROM "user" u
LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum
LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum
LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum
LEFT JOIN organization o ON u.organization_id = o.id
LEFT JOIN organization_general og ON o.organization_general_id = og.id
WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL
GROUP BY u.id, og.alias;`);
await queryRunner.query(
`INSERT INTO "typeorm_metadata"("database", "schema", "table", "type", "name", "value") VALUES (DEFAULT, $1, DEFAULT, $2, $3, $4)`,
[
'public',
'VIEW',
'UserApplicationsView',
"SELECT u.id,\n u.name,\n u.email,\n u.phone,\n u.status,\n u.role,\n u.organization_id AS \"organizationId\",\n u.created_on AS \"createdOn\",\n u.updated_on AS \"updatedOn\",\n og.alias,\n array_agg(DISTINCT a.id) AS \"availableAppsIDs\",\n json_agg(DISTINCT jsonb_build_object('id', a.id, 'name', a.name, 'type', a.type)) AS \"availableApps\"\n FROM \"user\" u\n LEFT JOIN user_ong_application uoa ON u.id = uoa.user_id AND uoa.status = 'active'::user_ong_application_status_enum\n LEFT JOIN ong_application oa ON uoa.ong_application_id = oa.id AND oa.status = 'active'::ong_application_status_enum\n LEFT JOIN application a ON (oa.application_id = a.id OR a.type = 'independent'::application_type_enum) AND a.status = 'active'::application_status_enum\n LEFT JOIN organization o ON u.organization_id = o.id\n LEFT JOIN organization_general og ON o.organization_general_id = og.id\n WHERE u.role = 'employee'::user_role_enum AND (u.status = ANY (ARRAY['active'::user_status_enum, 'restricted'::user_status_enum])) AND u.deleted_on IS NULL\n GROUP BY u.id, og.alias;",
],
);
}
}
34 changes: 34 additions & 0 deletions backend/src/migrations/1721829705666-AddIssuer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import { MigrationInterface, QueryRunner } from 'typeorm';
import { ISSUERS } from './seed/issuers.seed';
import { Issuer } from 'src/shared/entities';
export class AddIssuer1721829705666 implements MigrationInterface {
name = 'AddIssuer1721829705666';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`CREATE TABLE "_issuer" ("id" SERIAL NOT NULL, "deleted_on" TIMESTAMP WITH TIME ZONE, "created_on" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "updated_on" TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT now(), "name" text NOT NULL, CONSTRAINT "PK_cfe878b7aa3dc098f2ac736adc6" PRIMARY KEY ("id"))`,
);
await queryRunner.query(
`CREATE INDEX "IDX_20b3d0cad6a13638d5d485eada" ON "_issuer" ("created_on") `,
);
await queryRunner.manager
.createQueryBuilder()
.insert()
.into(Issuer)
.values(ISSUERS)
.execute();
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.manager
.createQueryBuilder()
.delete()
.from(Issuer)
.execute();

await queryRunner.query(
`DROP INDEX "public"."IDX_20b3d0cad6a13638d5d485eada"`,
);
await queryRunner.query(`DROP TABLE "_issuer"`);
}
}
53 changes: 53 additions & 0 deletions backend/src/migrations/1721899705666-NewGeneralFields.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class NewGeneralFields1721899705666 implements MigrationInterface {
name = 'NewGeneralFields1721899705666';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "organization_general" ALTER COLUMN "raf_number" DROP NOT NULL`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" ADD "association_registry_number" text`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" ADD "association_registry_part" text`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" ADD "association_registry_section" text`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" ADD "association_registry_issuer_id" integer`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" ADD CONSTRAINT "FK_302f085592ed8a6c5d06f1182ef" FOREIGN KEY ("association_registry_issuer_id") REFERENCES "_issuer"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" ADD "national_registry_number" text`,
);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(
`ALTER TABLE "organization_general" ALTER COLUMN "raf_number" SET NOT NULL`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" DROP COLUMN "national_registry_number"`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" DROP CONSTRAINT "FK_302f085592ed8a6c5d06f1182ef"`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" DROP COLUMN "association_registry_issuer_id"`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" DROP COLUMN "association_registry_section"`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" DROP COLUMN "association_registry_part"`,
);
await queryRunner.query(
`ALTER TABLE "organization_general" DROP COLUMN "association_registry_number"`,
);
}
}
27 changes: 27 additions & 0 deletions backend/src/migrations/1722099705666-SectorsSeed.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { City } from 'src/shared/entities';
import { MigrationInterface, QueryRunner } from 'typeorm';
import { SECTORS } from './seed/sectors.seed';

export class SectorsSeed1722099705666 implements MigrationInterface {
name = 'SectorsSeed1722099705666';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.manager
.createQueryBuilder()
.insert()
.into(City)
.values(SECTORS)
.execute();
}

public async down(queryRunner: QueryRunner): Promise<void> {
const sectorIds = SECTORS.map((sector) => sector.id);

await queryRunner.manager
.createQueryBuilder()
.delete()
.from(City)
.where('id IN (:...ids)', { ids: sectorIds })
.execute();
}
}
13 changes: 13 additions & 0 deletions backend/src/migrations/1722423180665-ContactRole.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class ContactRole1722423180665 implements MigrationInterface {
name = 'ContactRole1722423180665';

public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "_contact" ADD "role" text`);
}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`ALTER TABLE "_contact" DROP COLUMN "role"`);
}
}
10 changes: 5 additions & 5 deletions backend/src/migrations/seed/city.seed.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8899,11 +8899,11 @@ export const CITIES = [
countyId: 33,
name: 'Bucuresci',
},
{
id: 1781,
countyId: 11,
name: 'Bucuresti',
},
// {
// id: 1781,
// countyId: 11,
// name: 'Bucuresti',
// },
{
id: 1782,
countyId: 6,
Expand Down
Loading