Skip to content

Commit 5390040

Browse files
perekotypoleperekotypole
authored
Merge branch 'main' into 569-fix-delete-project-group-on-manage-project
2 parents 2a85fe0 + bff9835 commit 5390040

File tree

18 files changed

+70
-33
lines changed

18 files changed

+70
-33
lines changed

‎.release-please-manifest.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
".": "1.62.1",
3-
"apps/backend": "1.41.1",
4-
"apps/frontend": "1.58.1",
5-
"packages/shared": "1.38.0",
2+
".": "1.62.2",
3+
"apps/backend": "1.41.2",
4+
"apps/frontend": "1.59.0",
5+
"packages/shared": "1.38.1",
66
"scripts/analytics": "1.8.0"
77
}

‎CHANGELOG.md

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# Changelog
22

3+
## [1.62.2](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/v1.62.1...v1.62.2) (2024-09-27)
4+
5+
6+
### Bug Fixes
7+
8+
* rid of error throwing when project groups were not deleted by project id gf-555 ([#579](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/579)) ([38c6c23](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/38c6c234f6d212e62dc9220cea5d8abafaa81236))
9+
* Three Toast notifications are displayed on attempt to open a project page without a permission gf-567 ([#571](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/571)) ([6cb31d6](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/6cb31d6dcaca455a624df568738400ac722f122a))
10+
311
## [1.62.1](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/v1.62.0...v1.62.1) (2024-09-27)
412

513

‎apps/backend/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [1.41.2](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/backend-v1.41.1...backend-v1.41.2) (2024-09-27)
4+
5+
6+
### Bug Fixes
7+
8+
* rid of error throwing when project groups were not deleted by project id gf-555 ([#579](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/579)) ([38c6c23](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/38c6c234f6d212e62dc9220cea5d8abafaa81236))
9+
310
## [1.41.1](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/backend-v1.41.0...backend-v1.41.1) (2024-09-27)
411

512

‎apps/backend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@git-fit/backend",
33
"type": "module",
4-
"version": "1.41.1",
4+
"version": "1.41.2",
55
"engines": {
66
"node": "20.x.x",
77
"npm": "10.x.x"

‎apps/backend/src/libs/modules/server-application/libs/types/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
export { type ServerApplicationApi } from "../types/server-application-api.type.js";
21
export { type ServerApplication } from "./server-application.type.js";
2+
export { type ServerApplicationApi } from "./server-application-api.type.js";
33
export { type ServerApplicationRouteParameters } from "./server-application-route-parameters.type.js";

‎apps/backend/src/modules/project-groups/project-group.entity.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { type Entity } from "~/libs/types/types.js";
2+
import { type ProjectPermissionModel } from "~/modules/project-permissions/project-permissions.js";
23

34
import { type ProjectModel } from "../projects/project.model.js";
45
import { type UserModel } from "../users/user.model.js";
56
import { type ProjectGroupCreateResponseDto } from "./libs/types/types.js";
6-
import { type ProjectPermissionModel } from "./project-permission.model.js";
77

88
class ProjectGroupEntity implements Entity {
99
private createdAt: null | string;

‎apps/backend/src/modules/project-groups/project-group.model.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import {
44
AbstractModel,
55
DatabaseTableName,
66
} from "~/libs/modules/database/database.js";
7+
import { ProjectPermissionModel } from "~/modules/project-permissions/project-permissions.js";
78

89
import { ProjectModel } from "../projects/project.model.js";
910
import { UserModel } from "../users/user.model.js";
10-
import { ProjectPermissionModel } from "./project-permission.model.js";
1111

1212
class ProjectGroupModel extends AbstractModel {
1313
public key!: string;

‎apps/backend/src/modules/project-groups/project-permission.model.ts

-15
This file was deleted.

‎apps/backend/src/modules/project-permissions/project-permissions.ts

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ const projectPermissionsController = new ProjectPermissionsController(
1717
);
1818

1919
export { projectPermissionsController };
20+
export { ProjectPermissionModel } from "./project-permissions.model.js";

‎apps/frontend/CHANGELOG.md

+29
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,34 @@
11
# Changelog
22

3+
## [1.59.0](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/frontend-v1.58.1...frontend-v1.59.0) (2024-09-27)
4+
5+
6+
### Features
7+
8+
* ability to mark notifications as read gf-460 ([#498](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/498)) ([3ce21f7](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/3ce21f7c102898077d4be4177b02534277972c06))
9+
* add analytics last sync time to project details page gf-502 ([#526](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/526)) ([7f3f5c2](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/7f3f5c21a6312fb0a3ad1e04db1c2e17ffd47cc2))
10+
* add green tick for generation api key fulfilled gf-189 ([#568](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/568)) ([d4b2d82](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/d4b2d821ff6e40e0e792414545e80561a9f23bd3))
11+
* Add project select to the contributors page gf-504 ([#516](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/516)) ([3f1f1c5](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/3f1f1c52204f3233a350567b8c2b8915ce952cd7))
12+
* add search field to analytics page gf-352 ([#444](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/444)) ([71dcfb1](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/71dcfb15462b289bad70d90f65875bea40bbc560))
13+
* add validation notification for incorrect password on login gf-517 ([#532](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/532)) ([1cd0f50](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/1cd0f502ef3746940863937fd6f0b9c0ba11044a))
14+
* Adjust project permissions gf-351 ([#401](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/401)) ([1453c52](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/1453c52927ec3940e40331a3a93ea96c6a3ce060))
15+
* adjusted style for date column to align with the table head gf-545 ([#548](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/548)) ([11a237c](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/11a237c7c2b59a3a2a7049ef97ae4134229b2db0))
16+
* fix quality criteria issues gf-557 ([#561](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/561)) ([6b3c9ed](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/6b3c9edb8d111e64e175183f6222dfa33940679c))
17+
* redirect to analytics page on contributor item click gf-349 ([#512](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/512)) ([9861355](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/9861355e5ea555866cb5cf3fa909115d4a21beac))
18+
* upgrade the visibility of the project's options button on the project detail page gf-508 ([#514](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/514)) ([1d7d6f1](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/1d7d6f1f8ed86321fe2b7231c0424d06a5772daa))
19+
20+
21+
### Bug Fixes
22+
23+
* Browser Back button not functioning after redirecting to the Analytics page from the Project details page gf-540 ([#542](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/542)) ([4c8d9dd](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/4c8d9dd70e9e3cc6485bdbc3ff193da9584205f9))
24+
* fixed inconsistent analytics page alignment gf-530 ([#535](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/535)) ([8ee08ba](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/8ee08ba43e0e559706025ceec16fa43457d34978))
25+
* incorrect message displayed when all contributors are hidden gf-538 ([#539](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/539)) ([0dc06ae](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/0dc06aef56a3064730def9a6e46540d2c7ab79e8))
26+
* not all contributors are displayed in contributor merge form gf-550 ([#551](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/551)) ([c19adb8](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/c19adb8b042f877f18581626cfc22dc52e06de51))
27+
* reload contributors on split gf-519 ([#525](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/525)) ([f766ce8](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/f766ce8145a202626ad154753dc01e1af5ee29f4))
28+
* remove isDirty from analytics page gf-529 ([#531](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/531)) ([f43187b](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/f43187b1dd2fbe81eedf4ebe5d5a089f36602e82))
29+
* Three Toast notifications are displayed on attempt to open a project page without a permission gf-567 ([#571](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/571)) ([6cb31d6](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/6cb31d6dcaca455a624df568738400ac722f122a))
30+
* update hasSetupAnalyticsPermission check gf-573 ([#574](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/574)) ([b968e29](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/b968e291860ef52fb45b747abbef32affa0e730b))
31+
332
## [1.58.1](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/frontend-v1.58.0...frontend-v1.58.1) (2024-09-27)
433

534

‎apps/frontend/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@git-fit/frontend",
33
"private": true,
4-
"version": "1.58.1",
4+
"version": "1.59.0",
55
"type": "module",
66
"engines": {
77
"node": "20.x.x",

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "git-fit",
3-
"version": "1.62.1",
3+
"version": "1.62.2",
44
"type": "module",
55
"workspaces": [
66
"apps/*",

‎packages/shared/CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Changelog
22

3+
## [1.38.1](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/shared-v1.38.0...shared-v1.38.1) (2024-09-27)
4+
5+
6+
### Bug Fixes
7+
8+
* quality criteria issues gf-557 ([#580](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/issues/580)) ([5013012](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/commit/5013012e1c41baea1f729ee62e35ca4f59386008))
9+
310
## [1.38.0](https://github.com/BinaryStudioAcademy/bsa-2024-gitfit/compare/shared-v1.37.0...shared-v1.38.0) (2024-09-27)
411

512

‎packages/shared/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@git-fit/shared",
3-
"version": "1.38.0",
3+
"version": "1.38.1",
44
"type": "module",
55
"main": "build/index.js",
66
"types": "src/index.ts",

‎packages/shared/src/modules/auth-analytics/libs/validation-schemas/auth-analytics-validate-credentials.validation-schema.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { z } from "zod";
22

33
import { AuthAnalyticsValidationMessage } from "../enums/enums.js";
4-
import { type AuthAnalyticsValidateCredentialsRequestDto } from "../types/auth-analytics-validate-credentials-request-dto.type.js";
4+
import { type AuthAnalyticsValidateCredentialsRequestDto } from "../types/types.js";
55

66
const authAnalyticsValidateCredentials: z.ZodType<AuthAnalyticsValidateCredentialsRequestDto> =
77
z.object({

‎packages/shared/src/modules/contributors/libs/types/contributor-get-all-query-parameters.type.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {
22
type PaginationQueryParameters,
33
type ValueOf,
44
} from "../../../../libs/types/types.js";
5-
import { type ContributorOrderByKey } from "../enums/contributor-order-by-key.enum.js";
5+
import { type ContributorOrderByKey } from "../enums/enums.js";
66

77
type ContributorGetAllQueryParameters = {
88
contributorName?: string | undefined;

‎packages/shared/src/modules/project-groups/libs/types/types.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
export { type ProjectGroupCreateRequestDto } from "../types/project-group-create-request-dto.type.js";
2-
export { type ProjectGroupCreateResponseDto } from "../types/project-group-create-response-dto.type.js";
3-
export { type ProjectGroupGetAllItemResponseDto } from "../types/project-group-get-all-item-response-dto.type.js";
1+
export { type ProjectGroupCreateRequestDto } from "./project-group-create-request-dto.type.js";
2+
export { type ProjectGroupCreateResponseDto } from "./project-group-create-response-dto.type.js";
3+
export { type ProjectGroupGetAllItemResponseDto } from "./project-group-get-all-item-response-dto.type.js";
44
export { type ProjectGroupGetAllRequestDto } from "./project-group-get-all-request-dto.type.js";
55
export { type ProjectGroupGetAllResponseDto } from "./project-group-get-all-response-dto.type.js";
66
export { type ProjectGroupPatchRequestDto } from "./project-group-patch-request-dto.type.js";

0 commit comments

Comments
 (0)