Changed Prettier setting: lines are 120-char wide, previously 80

kamu-data · Aug 4, 2023 · 9f6a158 · 9f6a158
1 parent feb4044
commit 9f6a158
Show file tree

Hide file tree

Showing 288 changed files with 2,381 additions and 6,954 deletions.
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,6 +1,7 @@
 {
   "semi": true,
   "trailingComma": "all",
+  "printWidth": 120,
   "overrides": [
     {
       "files": "*.test.ts",
@@ -9,7 +10,10 @@
       }
     },
     {
-      "files": ["*.html", "**/*.ts"],
+      "files": [
+        "*.html",
+        "**/*.ts"
+      ],
       "options": {
         "tabWidth": 4
       }

diff --git a/src/app/api/account.api.ts b/src/app/api/account.api.ts
@@ -6,9 +6,7 @@ import { AccountDetailsFragment } from "./kamu.graphql.interface";
 
 @Injectable({ providedIn: "root" })
 export class AccountApi {
-    public getAccountInfoByName(
-        name: string,
-    ): Observable<AccountDetailsFragment> {
+    public getAccountInfoByName(name: string): Observable<AccountDetailsFragment> {
         return of({ ...mockAccountDetails, login: name });
     }
 }
diff --git a/src/app/api/auth.api.spec.ts b/src/app/api/auth.api.spec.ts
@@ -2,15 +2,8 @@ import { NavigationService } from "src/app/services/navigation.service";
 import { fakeAsync, TestBed, tick } from "@angular/core/testing";
 import { Apollo } from "apollo-angular";
 import { AuthApi } from "./auth.api";
-import {
-    AccountDetailsFragment,
-    FetchAccountInfoDocument,
-    GithubLoginDocument,
-} from "./kamu.graphql.interface";
-import {
-    ApolloTestingController,
-    ApolloTestingModule,
-} from "apollo-angular/testing";
+import { AccountDetailsFragment, FetchAccountInfoDocument, GithubLoginDocument } from "./kamu.graphql.interface";
+import { ApolloTestingController, ApolloTestingModule } from "apollo-angular/testing";
 import {
     mockGithubLoginResponse,
     mockLogin401Error,
@@ -45,14 +38,10 @@ describe("AuthApi", () => {
     });
 
     function loginViaAccessToken(): void {
-        service
-            .fetchUserInfoFromAccessToken(TEST_ACCESS_TOKEN)
-            .subscribe(() => {
-                expect(service.isAuthenticated).toBeTrue();
-                expect(service.currentUser).toBe(
-                    mockUserInfoFromAccessToken.auth.accountInfo,
-                );
-            });
+        service.fetchUserInfoFromAccessToken(TEST_ACCESS_TOKEN).subscribe(() => {
+            expect(service.isAuthenticated).toBeTrue();
+            expect(service.currentUser).toBe(mockUserInfoFromAccessToken.auth.accountInfo);
+        });
 
         const op = controller.expectOne(FetchAccountInfoDocument);
         expect(op.operation.variables.accessToken).toEqual(TEST_ACCESS_TOKEN);
@@ -63,18 +52,14 @@ describe("AuthApi", () => {
     }
 
     function loginFullyViaGithub(): void {
-        service
-            .fetchUserInfoAndTokenFromGithubCallackCode(TEST_GITHUB_CODE)
-            .subscribe(() => {
-                expect(service.isAuthenticated).toBeTrue();
-                expect(service.currentUser).toBe(
-                    mockGithubLoginResponse.auth.githubLogin.accountInfo,
-                );
-                expect(localStorageSetItemSpy).toHaveBeenCalledWith(
-                    AppValues.LOCAL_STORAGE_ACCESS_TOKEN,
-                    mockGithubLoginResponse.auth.githubLogin.token.accessToken,
-                );
-            });
+        service.fetchUserInfoAndTokenFromGithubCallackCode(TEST_GITHUB_CODE).subscribe(() => {
+            expect(service.isAuthenticated).toBeTrue();
+            expect(service.currentUser).toBe(mockGithubLoginResponse.auth.githubLogin.accountInfo);
+            expect(localStorageSetItemSpy).toHaveBeenCalledWith(
+                AppValues.LOCAL_STORAGE_ACCESS_TOKEN,
+                mockGithubLoginResponse.auth.githubLogin.token.accessToken,
+            );
+        });
 
         const op = controller.expectOne(GithubLoginDocument);
         expect(op.operation.variables.code).toEqual(TEST_GITHUB_CODE);
@@ -100,12 +85,10 @@ describe("AuthApi", () => {
 
     it("should check user changes via login with alive access token", fakeAsync(() => {
         let callbackInvoked = false;
-        service.onUserChanges.subscribe(
-            (user: MaybeNull<AccountDetailsFragment>) => {
-                callbackInvoked = true;
-                user ? checkUserIsLogged(user) : fail("User must not be null");
-            },
-        );
+        service.onUserChanges.subscribe((user: MaybeNull<AccountDetailsFragment>) => {
+            callbackInvoked = true;
+            user ? checkUserIsLogged(user) : fail("User must not be null");
+        });
 
         loginViaAccessToken();
         tick();
@@ -133,9 +116,7 @@ describe("AuthApi", () => {
             .subscribe(
                 () => fail("Unexpected success"),
                 (e: Error) => {
-                    expect(e).toEqual(
-                        new AuthenticationError([mockLogin401Error]),
-                    );
+                    expect(e).toEqual(new AuthenticationError([mockLogin401Error]));
                 },
             );
 
@@ -155,9 +136,7 @@ describe("AuthApi", () => {
             .subscribe(
                 () => fail("Unexpected success"),
                 (e: Error) => {
-                    expect(e).toEqual(
-                        new AuthenticationError([mockLogin401Error]),
-                    );
+                    expect(e).toEqual(new AuthenticationError([mockLogin401Error]));
                 },
             );
 

diff --git a/src/app/api/auth.api.ts b/src/app/api/auth.api.ts
@@ -21,8 +21,7 @@ import { AuthenticationError } from "../common/errors";
 export class AuthApi {
     private user: MaybeNull<AccountDetailsFragment> = null;
 
-    private userChanges$: Subject<MaybeNull<AccountDetailsFragment>> =
-        new Subject<MaybeNull<AccountDetailsFragment>>();
+    private userChanges$: Subject<MaybeNull<AccountDetailsFragment>> = new Subject<MaybeNull<AccountDetailsFragment>>();
 
     constructor(
         private githubLoginGQL: GithubLoginGQL,
@@ -47,17 +46,12 @@ export class AuthApi {
         this.userChanges$.next(user);
     }
 
-    public fetchUserInfoAndTokenFromGithubCallackCode(
-        code: string,
-    ): Observable<void> {
+    public fetchUserInfoAndTokenFromGithubCallackCode(code: string): Observable<void> {
         return this.githubLoginGQL.mutate({ code }).pipe(
             map((result: MutationResult<GithubLoginMutation>) => {
                 if (result.data) {
                     const data: GithubLoginMutation = result.data;
-                    localStorage.setItem(
-                        AppValues.LOCAL_STORAGE_ACCESS_TOKEN,
-                        data.auth.githubLogin.token.accessToken,
-                    );
+                    localStorage.setItem(AppValues.LOCAL_STORAGE_ACCESS_TOKEN, data.auth.githubLogin.token.accessToken);
                     this.changeUser(data.auth.githubLogin.accountInfo);
                 } else {
                     throw new AuthenticationError(result.errors ?? []);

diff --git a/src/app/api/dataset.api.spec.ts b/src/app/api/dataset.api.spec.ts
@@ -12,10 +12,7 @@ import {
     mockDatasetMainDataResponse,
 } from "./../search/mock.data";
 import { TestBed } from "@angular/core/testing";
-import {
-    ApolloTestingController,
-    ApolloTestingModule,
-} from "apollo-angular/testing";
+import { ApolloTestingController, ApolloTestingModule } from "apollo-angular/testing";
 import { DatasetApi } from "./dataset.api";
 import {
     CommitEventToDatasetDocument,
@@ -60,9 +57,7 @@ describe("DatasetApi", () => {
                 datasetName: TEST_DATASET_NAME,
             })
             .subscribe((res: GetDatasetMainDataQuery) => {
-                expect(res.datasets.byOwnerAndName?.name).toEqual(
-                    "alberta.case-details",
-                );
+                expect(res.datasets.byOwnerAndName?.name).toEqual("alberta.case-details");
                 expect(res.datasets.byOwnerAndName?.id).toEqual(
                     "did:odf:z4k88e8rxU6m5wCnK9idM5sGAxAGfvUgNgQbckwJ4ro78tXMLSu",
                 );
@@ -91,9 +86,7 @@ describe("DatasetApi", () => {
                     actualQuery.__typename === "DataQueryResultSuccess" &&
                     expectedQuery.__typename === "DataQueryResultSuccess"
                 ) {
-                    expect(actualQuery.data.content).toEqual(
-                        expectedQuery.data.content,
-                    );
+                    expect(actualQuery.data.content).toEqual(expectedQuery.data.content);
                 } else {
                     fail("expecting successful query");
                 }
@@ -117,12 +110,8 @@ describe("DatasetApi", () => {
                 numPage: 1,
             })
             .subscribe((res: GetDatasetHistoryQuery) => {
-                expect(
-                    res.datasets.byOwnerAndName?.metadata.chain.blocks
-                        .totalCount,
-                ).toEqual(
-                    mockDatasetHistoryResponse.datasets.byOwnerAndName?.metadata
-                        .chain.blocks.totalCount,
+                expect(res.datasets.byOwnerAndName?.metadata.chain.blocks.totalCount).toEqual(
+                    mockDatasetHistoryResponse.datasets.byOwnerAndName?.metadata.chain.blocks.totalCount,
                 );
             });
 
@@ -136,18 +125,14 @@ describe("DatasetApi", () => {
     });
 
     it("should extract datasets by account name", () => {
-        service
-            .fetchDatasetsByAccountName(TEST_USER_NAME)
-            .subscribe((res: DatasetsByAccountNameQuery) => {
-                expect(res.datasets.byAccountName.totalCount).toEqual(
-                    mockDatasetsByAccountNameQuery.datasets.byAccountName
-                        .totalCount,
-                );
-                expect(res.datasets.byAccountName.nodes[0].name).toEqual(
-                    mockDatasetsByAccountNameQuery.datasets.byAccountName
-                        .nodes[0].name,
-                );
-            });
+        service.fetchDatasetsByAccountName(TEST_USER_NAME).subscribe((res: DatasetsByAccountNameQuery) => {
+            expect(res.datasets.byAccountName.totalCount).toEqual(
+                mockDatasetsByAccountNameQuery.datasets.byAccountName.totalCount,
+            );
+            expect(res.datasets.byAccountName.nodes[0].name).toEqual(
+                mockDatasetsByAccountNameQuery.datasets.byAccountName.nodes[0].name,
+            );
+        });
 
         const op = controller.expectOne(DatasetsByAccountNameDocument);
         expect(op.operation.variables.accountName).toEqual(TEST_USER_NAME);
@@ -158,24 +143,20 @@ describe("DatasetApi", () => {
     });
 
     it("should load block by hash", () => {
-        const blockByHash =
-            mockGetMetadataBlockQuery.datasets.byOwnerAndName?.metadata.chain
-                .blockByHash;
+        const blockByHash = mockGetMetadataBlockQuery.datasets.byOwnerAndName?.metadata.chain.blockByHash;
         service
             .getBlockByHash({
                 accountName: TEST_USER_NAME,
                 datasetName: TEST_DATASET_NAME,
                 blockHash: TEST_BLOCK_HASH,
             })
             .subscribe((res: GetMetadataBlockQuery) => {
-                expect(
-                    res.datasets.byOwnerAndName?.metadata.chain.blockByHash
-                        ?.blockHash,
-                ).toEqual(blockByHash?.blockHash);
-                expect(
-                    res.datasets.byOwnerAndName?.metadata.chain.blockByHash
-                        ?.author.name,
-                ).toEqual(blockByHash?.author.name);
+                expect(res.datasets.byOwnerAndName?.metadata.chain.blockByHash?.blockHash).toEqual(
+                    blockByHash?.blockHash,
+                );
+                expect(res.datasets.byOwnerAndName?.metadata.chain.blockByHash?.author.name).toEqual(
+                    blockByHash?.author.name,
+                );
             });
 
         const op = controller.expectOne(GetMetadataBlockDocument);
@@ -195,14 +176,9 @@ describe("DatasetApi", () => {
                 datasetId: mockDatasetId,
                 event: mockEvent,
             })
-            .subscribe(
-                (res: CommitEventToDatasetMutation | null | undefined) => {
-                    expect(
-                        res?.datasets.byId?.metadata.chain.commitEvent
-                            .__typename,
-                    ).toEqual("CommitResultSuccess");
-                },
-            );
+            .subscribe((res: CommitEventToDatasetMutation | null | undefined) => {
+                expect(res?.datasets.byId?.metadata.chain.commitEvent.__typename).toEqual("CommitResultSuccess");
+            });
 
         const op = controller.expectOne(CommitEventToDatasetDocument);
         expect(op.operation.variables.datasetId).toEqual(mockDatasetId);