feat: Add project select to the contributors page gf-504 #516

GvoFor · 2024-09-24T14:19:07Z

Features

Added project select above contributors table

Screenshots

…not only selected gf-504

…r gf-504

apps/frontend/src/modules/contributors/slices/actions.ts

…ected gf-504

…page

apps/backend/src/modules/contributors/contributor.controller.ts

what1s1ove · 2024-09-26T06:07:14Z

apps/frontend/src/pages/contributors/contributors.tsx

 	});

-	useEffect(() => {
+	const loadContributors = useCallback(() => {


apps/backend/src/modules/contributors/contributor.controller.ts

apps/backend/src/modules/contributors/contributor.repository.ts

liza-veis · 2024-09-26T12:04:40Z

packages/shared/src/modules/contributors/libs/types/contributor-get-all-request-dto.type.ts

+} from "../../../../libs/types/types.js";
+import { type ContributorOrderBy } from "../enums/contributor-order-by.enum.js";
+
+type ContributorGetAllRequestDto = {


Aren't these query parameters? Request dto is for request body

type ContributorGetAllQueryParameters =

apps/backend/src/modules/contributors/contributor.controller.ts

liza-veis · 2024-09-26T12:17:31Z

apps/backend/src/modules/contributors/contributor.repository.ts

+		switch (orderBy) {
+			case ContributorOrderBy.CREATED_AT: {
+				query.orderBy(ContributorOrderBy.CREATED_AT, SortType.DESCENDING);
+				break;
+			}

-	public async findAllWithoutPagination({
-		contributorName,
-		hasHidden = true,
-	}: {
-		contributorName?: string;
-		hasHidden?: boolean;
-	}): Promise<{ items: ContributorEntity[] }> {
-		const query = this.contributorModel
-			.query()
-			.select("contributors.*")
-			.select(
-				raw(
-					"COALESCE(ARRAY_AGG(DISTINCT jsonb_build_object('id', projects.id, 'name', projects.name)) FILTER (WHERE projects.id IS NOT NULL), '{}') AS projects",
-				),
-			)
-			.leftJoin("git_emails", "contributors.id", "git_emails.contributor_id")
-			.leftJoin("activity_logs", "git_emails.id", "activity_logs.git_email_id")
-			.leftJoin("projects", "activity_logs.project_id", "projects.id")
-			.groupBy("contributors.id")
-			.withGraphFetched("gitEmails");
-
-		if (!hasHidden) {
-			query.whereNull("contributors.hiddenAt");
+			case ContributorOrderBy.LAST_ACTIVITY_DATE: {
+				query.orderBy(
+					ContributorOrderBy.LAST_ACTIVITY_DATE,
+					SortType.DESCENDING,
+				);
+				break;
+			}


Looks like we don't need all this logic and we can do it this way:

query.orderBy(orderBy, SortType.DESCENDING);

in case we need another sortType, this should be passed to query parameters. And for query params validation itself we need to have a validation schema which will restrict orderBy only to two options

liza-veis · 2024-09-26T12:19:47Z

packages/shared/src/modules/contributors/libs/enums/contributor-order-by.enum.ts

@@ -0,0 +1,6 @@
+const ContributorOrderBy = {


Suggested change

const ContributorOrderBy = {

const ContributorOrderByKey = {

…pe gf-504

...ed/src/modules/contributors/libs/validation-schemas/contributor-get-all.validation-schema.ts

apps/backend/src/modules/contributors/contributor.controller.ts

…page

GvoFor · 2024-09-26T20:08:34Z

I'm sure I miss some buisness logic bugs while resolving conflicts, so I'll try to find them out tomorrow

what1s1ove

lgtm after Lisa's comments

…page

GvoFor · 2024-09-27T08:12:47Z

apps/backend/src/modules/project-groups/project-group.repository.ts

-		return results.map(({ projects, ...projectGroup }) => {
-			const [project] = projects;
+		return results
+			.filter(({ projects }) => projects.length)


This check for cases when user deletes project, which has some project groups. After such a deletion in the DB project groups are remained in project_groups table, but they relation with projects are lost (corresponding record in projects_to_project_groups are deleted). So without this .filter, project in const [project] = projects; expression is undefined which leads to Reading property 'id' of undefined error.

It would be better to remove this filter after we fix mentioned issue.

we need to remove this. This shouldn't be the case for project groups. We need to create a migration to make the project field required and delete groups by cascade

Vitaliistf · 2024-09-27T08:42:35Z

packages/shared/src/modules/contributors/libs/enums/contributor-order-by-key.enum.ts

+	CREATED_AT: "created_at",
+	LAST_ACTIVITY_DATE: "last_activity_date",


So as we agreed, maybe we should use camelCase here? (I think that this might be fixed in ticket regarding quality criteria, but if you'll fix anything else, you might to fix this also).

@Vitaliistf can we fix this in your PR please? we need this pr to be merged to fix deployment

GvoFor added 3 commits September 24, 2024 16:12

feat: add select project component gf-504

d2721c0

feat: place loader inside table gf-504

885afb7

fix: display only contributors of selected project gf-504

c89a88a

GvoFor added this to the git-fit-release-6 milestone Sep 24, 2024

GvoFor self-assigned this Sep 24, 2024

GvoFor requested review from liza-veis, what1s1ove and yevhenii-hladkov as code owners September 24, 2024 14:19

GvoFor marked this pull request as draft September 24, 2024 14:19

github-actions bot added the frontend label Sep 24, 2024

GvoFor added 2 commits September 24, 2024 22:24

fix: findAllByProjectId so it returns all contributor's projects and …

c28407c

…not only selected gf-504

fix: findAll methods so all of them orders results in descending orde…

b982717

…r gf-504

github-actions bot added the backend label Sep 24, 2024

perekotypole reviewed Sep 25, 2024

View reviewed changes

apps/frontend/src/modules/contributors/slices/actions.ts Outdated Show resolved Hide resolved

GvoFor added 3 commits September 25, 2024 11:45

refactor: rid of code duplication and fix pagination when project sel…

658988e

…ected gf-504

fix: remove unneccessary changes and fix import gf-504

2ec5044

Merge branch 'main' into 504-feat-add-project-select-to-contributors-…

8954a80

…page

github-actions bot added the shared label Sep 25, 2024

kolibri753 added the conflicts label Sep 25, 2024

GvoFor added 2 commits September 25, 2024 13:55

fix: do not render untracked contributor cards gf-504

7818fa2

Merge branch 'main' into 504-feat-add-project-select-to-contributors-…

c118158

…page

GvoFor removed the conflicts label Sep 25, 2024

GvoFor added 3 commits September 25, 2024 17:10

fix: update contributor.controller findAll swagger comment gf-504

9c2ac01

Merge branch 'main' into 504-feat-add-project-select-to-contributors-…

8a4e774

…page

feat: link Select with URL gf-504

4471e96

GvoFor marked this pull request as ready for review September 25, 2024 15:16

GvoFor requested a review from perekotypole September 25, 2024 15:16

perekotypole reviewed Sep 25, 2024

View reviewed changes

apps/backend/src/modules/contributors/contributor.controller.ts Show resolved Hide resolved

what1s1ove reviewed Sep 26, 2024

View reviewed changes

fix: include contributorName into queryToSend gf-504

85861f8

fix: order of contributor cards gf-504

59ab1bb

GvoFor commented Sep 26, 2024

View reviewed changes

apps/backend/src/modules/contributors/contributor.controller.ts Outdated Show resolved Hide resolved

GvoFor commented Sep 26, 2024

View reviewed changes

apps/backend/src/modules/contributors/contributor.repository.ts Outdated Show resolved Hide resolved

refactor: use enum values gf-504

bd621ac

liza-veis requested changes Sep 26, 2024

View reviewed changes

GvoFor added 4 commits September 26, 2024 15:56

refactor: rename RequestDto to queryParameters gf-504

c38accb

refactor: rename ContributorOrderBy to ContributorOrderByKey gf-504

33bf93e

refactor: move contributor orderBy validation to schema gf-504

3e14e24

refactor: make projectId be a number in ActivityLogQueryParameters ty…

daf3498

…pe gf-504

GvoFor requested review from Vitaliistf, kolibri753, liza-veis and perekotypole September 26, 2024 14:21

liza-veis requested changes Sep 26, 2024

View reviewed changes

...ed/src/modules/contributors/libs/validation-schemas/contributor-get-all.validation-schema.ts Show resolved Hide resolved

apps/backend/src/modules/contributors/contributor.controller.ts Show resolved Hide resolved

GvoFor added the conflicts label Sep 26, 2024

Merge branch 'main' into 504-feat-add-project-select-to-contributors-…

99169d2

…page

GvoFor removed the conflicts label Sep 26, 2024

what1s1ove approved these changes Sep 27, 2024

View reviewed changes

what1s1ove added the conflicts label Sep 27, 2024

GvoFor added 2 commits September 27, 2024 10:54

Merge branch 'main' into 504-feat-add-project-select-to-contributors-…

49b34ee

…page

refactor: remove TODO comment gf-504

94dc279

GvoFor commented Sep 27, 2024

View reviewed changes

GvoFor requested a review from liza-veis September 27, 2024 08:20

Vitaliistf reviewed Sep 27, 2024

View reviewed changes

liza-veis approved these changes Sep 27, 2024

View reviewed changes

liza-veis merged commit 3f1f1c5 into main Sep 27, 2024

This was referenced Sep 27, 2024

chore: release-1.61.0 #556

Merged

chore: release-1.62.2 #577

Merged

chore: release-1.63.0 #582

Merged

		CREATED_AT: "created_at",
		LAST_ACTIVITY_DATE: "last_activity_date",

feat: Add project select to the contributors page gf-504 #516

feat: Add project select to the contributors page gf-504 #516

Uh oh!

Conversation

GvoFor commented Sep 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Features

Screenshots

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

GvoFor commented Sep 26, 2024

Uh oh!

what1s1ove left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

liza-veis Sep 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

GvoFor commented Sep 24, 2024 •

edited

Loading

liza-veis Sep 27, 2024 •

edited

Loading