From 884b7f4de7ce8ec51a0015060e5bfa16f7364617 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sun, 24 Sep 2023 08:25:25 +0200 Subject: [PATCH 1/6] Clean up (#2342) --- .../app/pages/portfolio/activities/activities-page.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts index 34525436d..259611c0d 100644 --- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts +++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts @@ -80,8 +80,6 @@ export class ActivitiesPageComponent implements OnDestroy, OnInit { } public ngOnInit() { - const { globalPermissions } = this.dataService.fetchInfo(); - this.deviceType = this.deviceService.getDeviceInfo().deviceType; this.impersonationStorageService From 01b6bb5b991220d50228165a777f2638dc412a6e Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Mon, 25 Sep 2023 23:37:52 +0200 Subject: [PATCH 2/6] Clean up (#2390) --- .../src/app/platform/platform.controller.ts | 1 + apps/api/src/app/platform/platform.service.ts | 24 +++++++++---------- .../admin-platform.component.ts | 3 +-- ...te-or-update-account-platform.component.ts | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/api/src/app/platform/platform.controller.ts b/apps/api/src/app/platform/platform.controller.ts index 8c4d62bd6..0369da8a3 100644 --- a/apps/api/src/app/platform/platform.controller.ts +++ b/apps/api/src/app/platform/platform.controller.ts @@ -47,6 +47,7 @@ export class PlatformController { StatusCodes.FORBIDDEN ); } + return this.platformService.createPlatform(data); } diff --git a/apps/api/src/app/platform/platform.service.ts b/apps/api/src/app/platform/platform.service.ts index 12d107604..35730d041 100644 --- a/apps/api/src/app/platform/platform.service.ts +++ b/apps/api/src/app/platform/platform.service.ts @@ -6,6 +6,18 @@ import { Platform, Prisma } from '@prisma/client'; export class PlatformService { public constructor(private readonly prismaService: PrismaService) {} + public async createPlatform(data: Prisma.PlatformCreateInput) { + return this.prismaService.platform.create({ + data + }); + } + + public async deletePlatform( + where: Prisma.PlatformWhereUniqueInput + ): Promise { + return this.prismaService.platform.delete({ where }); + } + public async getPlatform( platformWhereUniqueInput: Prisma.PlatformWhereUniqueInput ): Promise { @@ -56,12 +68,6 @@ export class PlatformService { }); } - public async createPlatform(data: Prisma.PlatformCreateInput) { - return this.prismaService.platform.create({ - data - }); - } - public async updatePlatform({ data, where @@ -74,10 +80,4 @@ export class PlatformService { where }); } - - public async deletePlatform( - where: Prisma.PlatformWhereUniqueInput - ): Promise { - return this.prismaService.platform.delete({ where }); - } } diff --git a/apps/client/src/app/components/admin-platform/admin-platform.component.ts b/apps/client/src/app/components/admin-platform/admin-platform.component.ts index f3fbb348d..f8f1f4b58 100644 --- a/apps/client/src/app/components/admin-platform/admin-platform.component.ts +++ b/apps/client/src/app/components/admin-platform/admin-platform.component.ts @@ -114,6 +114,7 @@ export class AdminPlatformComponent implements OnInit, OnDestroy { .pipe(takeUntil(this.unsubscribeSubject)) .subscribe((platforms) => { this.platforms = platforms; + this.dataSource = new MatTableDataSource(platforms); this.dataSource.sort = this.sort; this.dataSource.sortingDataAccessor = get; @@ -130,7 +131,6 @@ export class AdminPlatformComponent implements OnInit, OnDestroy { url: null } }, - height: this.deviceType === 'mobile' ? '97.5vh' : '80vh', width: this.deviceType === 'mobile' ? '100vw' : '50rem' }); @@ -170,7 +170,6 @@ export class AdminPlatformComponent implements OnInit, OnDestroy { url } }, - height: this.deviceType === 'mobile' ? '97.5vh' : '80vh', width: this.deviceType === 'mobile' ? '100vw' : '50rem' }); diff --git a/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts index 55d466a9a..14d893900 100644 --- a/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts +++ b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts @@ -15,8 +15,8 @@ export class CreateOrUpdatePlatformDialog { private unsubscribeSubject = new Subject(); public constructor( - public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdatePlatformDialogParams + @Inject(MAT_DIALOG_DATA) public data: CreateOrUpdatePlatformDialogParams, + public dialogRef: MatDialogRef ) {} public onCancel() { From aa872629549af488b2670b9fd3a0d62d9cf97e02 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 26 Sep 2023 07:51:27 +0200 Subject: [PATCH 3/6] Feature/upgrade yahoo finance2 to version 2.7.0 (#2392) * Upgrade yahoo-finance2 to version 2.7.0 * Update changelog --- CHANGELOG.md | 6 ++++++ package.json | 2 +- yarn.lock | 16 ++++++++++++---- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d82d8853..9aab3a442 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased + +### Changed + +- Upgraded `yahoo-finance2` from version `2.5.0` to `2.7.0` + ## 2.5.0 - 2023-09-23 ### Added diff --git a/package.json b/package.json index 48d83f597..936dcf6c7 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "svgmap": "2.6.0", "twitter-api-v2": "1.14.2", "uuid": "9.0.0", - "yahoo-finance2": "2.5.0", + "yahoo-finance2": "2.7.0", "zone.js": "0.13.1" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index ab4cd5f9d..95c61a7a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17889,6 +17889,13 @@ toidentifier@1.0.1: resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35" integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA== +tough-cookie-file-store@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/tough-cookie-file-store/-/tough-cookie-file-store-2.0.3.tgz#788f7a6fe5cd8f61a1afb71b2f0b964ebf914b80" + integrity sha512-sMpZVcmFf6EYFHFFl+SYH4W1/OnXBYMGDsv2IlbQ2caHyFElW/UR/gpj/KYU1JwmP4dE9xqwv2+vWcmlXHojSw== + dependencies: + tough-cookie "^4.0.0" + tough-cookie@^4.0.0, tough-cookie@^4.1.2: version "4.1.3" resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf" @@ -19035,16 +19042,17 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yahoo-finance2@2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/yahoo-finance2/-/yahoo-finance2-2.5.0.tgz#847834b33d24dc8ce96357401aba7dae1bcfda9f" - integrity sha512-YTniHzTx17lrs7tUonFZMWvY0dF4UJSrPkrTNMqNrb+la7Nde/5KY7mQFf+8VdXhngPup2V9ex27M2WK3ADtbw== +yahoo-finance2@2.7.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/yahoo-finance2/-/yahoo-finance2-2.7.0.tgz#2f3d078409616495a6f9357b1cce1c797903b82c" + integrity sha512-kh/t3P72MDLyf1jCEPTVZXtIwW8tuxhEg2zWHhPINxnBCT6cToQjF59dWnHNosPji5iUmtvhMWLmMbWJkBBSSw== dependencies: "@types/tough-cookie" "^4.0.2" ajv "8.10.0" ajv-formats "2.1.1" node-fetch "^2.6.1" tough-cookie "^4.1.2" + tough-cookie-file-store "^2.0.3" yallist@^3.0.2: version "3.1.1" From ad3e6d637c23a35fba623e2d06a40601798bdfbb Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:04:32 +0200 Subject: [PATCH 4/6] Improve file name (#2391) --- .../app/components/admin-platform/admin-platform.component.ts | 2 +- ...mponent.ts => create-or-update-platform-dialog.component.ts} | 0 .../create-or-update-platform-dialog.module.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/{create-or-update-account-platform.component.ts => create-or-update-platform-dialog.component.ts} (100%) diff --git a/apps/client/src/app/components/admin-platform/admin-platform.component.ts b/apps/client/src/app/components/admin-platform/admin-platform.component.ts index f8f1f4b58..c8fce18ad 100644 --- a/apps/client/src/app/components/admin-platform/admin-platform.component.ts +++ b/apps/client/src/app/components/admin-platform/admin-platform.component.ts @@ -19,7 +19,7 @@ import { get } from 'lodash'; import { DeviceDetectorService } from 'ngx-device-detector'; import { Subject, takeUntil } from 'rxjs'; -import { CreateOrUpdatePlatformDialog } from './create-or-update-platform-dialog/create-or-update-account-platform.component'; +import { CreateOrUpdatePlatformDialog } from './create-or-update-platform-dialog/create-or-update-platform-dialog.component'; @Component({ changeDetection: ChangeDetectionStrategy.OnPush, diff --git a/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.component.ts similarity index 100% rename from apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-account-platform.component.ts rename to apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.component.ts diff --git a/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts index cbc74b9cf..bf576480a 100644 --- a/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts +++ b/apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.module.ts @@ -6,7 +6,7 @@ import { MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; import { MatInputModule } from '@angular/material/input'; -import { CreateOrUpdatePlatformDialog } from './create-or-update-account-platform.component'; +import { CreateOrUpdatePlatformDialog } from './create-or-update-platform-dialog.component'; @NgModule({ declarations: [CreateOrUpdatePlatformDialog], From 4100446cac3b7f7b058a063dedfaeef613cd5343 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:05:14 +0200 Subject: [PATCH 5/6] Update OSS Friends (#2385) --- apps/client/src/assets/oss-friends.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/client/src/assets/oss-friends.json b/apps/client/src/assets/oss-friends.json index cceb8a836..24c2d8586 100644 --- a/apps/client/src/assets/oss-friends.json +++ b/apps/client/src/assets/oss-friends.json @@ -1,5 +1,5 @@ { - "createdAt": "2023-09-18T13:16:22.059Z", + "createdAt": "2023-09-25T08:15:38.055Z", "data": [ { "name": "Appsmith", @@ -81,6 +81,11 @@ "description": "Open-source monitoring platform with beautiful status pages", "href": "https://www.openstatus.dev" }, + { + "name": "Papermark", + "description": "Open-Source Docsend Alternative to securely share documents with real-time analytics.", + "href": "https://www.papermark.io/" + }, { "name": "Requestly", "description": "Makes frontend development cycle 10x faster with API Client, Mock Server, Intercept & Modify HTTP Requests and Session Replays.", From 8b615d2f561ea14a66bf863db6f458b4a3469efd Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 26 Sep 2023 15:07:20 +0200 Subject: [PATCH 6/6] Feature/upgrade prettier to version 3.0.3 (#2393) * Upgrade prettier to version 3.0.3 * Update changelog --- CHANGELOG.md | 1 + package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aab3a442..335c7d5a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +- Upgraded `prettier` from version `3.0.2` to `3.0.3` - Upgraded `yahoo-finance2` from version `2.5.0` to `2.7.0` ## 2.5.0 - 2023-09-23 diff --git a/package.json b/package.json index 936dcf6c7..c6fdf96ac 100644 --- a/package.json +++ b/package.json @@ -189,7 +189,7 @@ "jest-preset-angular": "13.1.1", "nx": "16.7.4", "nx-cloud": "16.3.0", - "prettier": "3.0.2", + "prettier": "3.0.3", "prettier-plugin-organize-attributes": "1.0.0", "react": "18.2.0", "react-dom": "18.2.0", diff --git a/yarn.lock b/yarn.lock index 95c61a7a0..e2f61eb9a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15881,10 +15881,10 @@ prettier-plugin-organize-attributes@1.0.0: resolved "https://registry.yarnpkg.com/prettier-plugin-organize-attributes/-/prettier-plugin-organize-attributes-1.0.0.tgz#037870ee3111b3c1d6371f677b64888de353cc63" integrity sha512-+NmameaLxbCcylEXsKPmawtzla5EE6ECqvGkpfQz4KM847fXDifB1gFnPQEpoADAq6IXg+cMI8Z0ISJEXa6fhg== -prettier@3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b" - integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ== +prettier@3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643" + integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg== prettier@^2.8.0: version "2.8.8"