Skip to content

Commit 0fb32b1

Browse files
authored
Merge pull request #760 from PermanentOrg/628-enable-lint-rules-part-6
Enable lint rules (Part 6)
2 parents d6efcd3 + 72e5e8d commit 0fb32b1

File tree

17 files changed

+48
-36
lines changed

17 files changed

+48
-36
lines changed

eslint.config.mjs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -136,21 +136,9 @@ export default typescriptEslint.config([
136136

137137
'@angular-eslint/prefer-standalone': 'off',
138138
'class-methods-use-this': 'off',
139-
'no-await-in-loop': 'off',
140-
'no-case-declarations': 'off',
141139
'no-param-reassign': 'off',
142-
'no-promise-executor-return': 'off',
143-
'no-prototype-builtins': 'off',
144-
'no-restricted-globals': 'off',
145-
'no-restricted-properties': 'off',
146140
'prefer-arrow/prefer-arrow-functions': 'off',
147141
'prefer-destructuring': 'off',
148-
'prefer-exponentiation-operator': 'off',
149-
'prefer-object-spread': 'off',
150-
'prefer-promise-reject-errors': 'off',
151-
'prefer-regex-literals': 'off',
152-
'prefer-template': 'off',
153-
'vars-on-top': 'off',
154142
},
155143
},
156144
{

src/app/archive-settings/manage-metadata/subcomponents/form-create/form-create.component.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ describe('FormCreateComponent', () => {
9999
fixture.detectChanges();
100100

101101
expect(find('input').length).toBe(1);
102-
await new Promise((resolve) => setTimeout(resolve, 1));
102+
await new Promise<void>((resolve) => {
103+
setTimeout(resolve, 1);
104+
});
103105

104106
expect(instance.waiting).toBe(false);
105107
});

src/app/archive-settings/manage-metadata/subcomponents/form-create/form-create.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ export class FormCreateComponent implements OnInit, OnDestroy {
4848
this.newTagName = '';
4949
} catch (c) {
5050
// Wait for next tick to keep waiting = false in case submit is run multiple times
51-
await new Promise((resolve) => setTimeout(resolve));
51+
await new Promise<void>((resolve) => {
52+
setTimeout(resolve);
53+
});
5254
} finally {
5355
this.waiting = false;
5456
}

src/app/core/components/account-settings/account-settings.component.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ describe('AccountSettingsComponent', () => {
6060

6161
try {
6262
await instance.onSaveProfileInfo('fullName', 'New Name');
63-
await new Promise((r) => setTimeout(r, 0));
63+
await new Promise<void>((r) => {
64+
setTimeout(r, 0);
65+
});
6466
} finally {
6567
expect(setAccountSpy).toHaveBeenCalled();
6668
expect(accountUpdateSpy).toHaveBeenCalled();
@@ -84,7 +86,9 @@ describe('AccountSettingsComponent', () => {
8486

8587
try {
8688
await instance.onSaveProfileInfo('fullName', 'New Name');
87-
await new Promise((r) => setTimeout(r, 0));
89+
await new Promise<void>((r) => {
90+
setTimeout(r, 0);
91+
});
8892
} finally {
8993
expect(setAccountSpy).not.toHaveBeenCalled();
9094
expect(accountUpdateSpy).toHaveBeenCalled();

src/app/core/components/billing-settings/billing-settings.component.spec.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,9 @@ describe('BillingSettingsComponent', () => {
6565

6666
try {
6767
await instance.onSaveInfo('fullName', 'New Name');
68-
await new Promise((r) => setTimeout(r, 0));
68+
await new Promise<void>((r) => {
69+
setTimeout(r, 0);
70+
});
6971
} finally {
7072
expect(setAccountSpy).toHaveBeenCalled();
7173
expect(accountUpdateSpy).toHaveBeenCalled();
@@ -90,7 +92,9 @@ describe('BillingSettingsComponent', () => {
9092

9193
try {
9294
await instance.onSaveInfo('fullName', 'New Name');
93-
await new Promise((r) => setTimeout(r, 0));
95+
await new Promise<void>((r) => {
96+
setTimeout(r, 0);
97+
});
9498
} finally {
9599
expect(setAccountSpy).not.toHaveBeenCalled();
96100
expect(accountUpdateSpy).toHaveBeenCalled();

src/app/core/services/edit/edit.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ export class EditService {
248248
actionDeferred.resolve();
249249
this.openPublishDialog(items[0]);
250250
break;
251-
case 'share':
251+
case 'share': {
252252
const response: ShareResponse = await this.api.share.getShareLink(
253253
items[0],
254254
);
@@ -260,6 +260,7 @@ export class EditService {
260260
},
261261
});
262262
break;
263+
}
263264
default:
264265
actionDeferred.resolve();
265266
}

src/app/directive/components/directive-edit/test-utils.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ export class MockDirectiveRepo {
4242
directive: DirectiveCreateRequest,
4343
): Promise<DirectiveData> {
4444
if (MockDirectiveRepo.failRequest) {
45-
await new Promise((resolve) =>
46-
setTimeout(resolve, MockDirectiveRepo.errorDelay),
47-
);
45+
await new Promise<void>((resolve) => {
46+
setTimeout(resolve, MockDirectiveRepo.errorDelay);
47+
});
4848
throw new Error('Forced Unit Test Error');
4949
}
5050
if (!MockDirectiveRepo.accountExists) {
@@ -86,9 +86,9 @@ export class MockDirectiveRepo {
8686
directive: Partial<DirectiveData>,
8787
): Promise<DirectiveData> {
8888
if (MockDirectiveRepo.failRequest) {
89-
await new Promise((resolve) =>
90-
setTimeout(resolve, MockDirectiveRepo.errorDelay),
91-
);
89+
await new Promise<void>((resolve) => {
90+
setTimeout(resolve, MockDirectiveRepo.errorDelay);
91+
});
9292
throw new Error('Forced Unit Test Error');
9393
}
9494
if (!MockDirectiveRepo.accountExists) {

src/app/file-browser/components/file-list-item/file-list-item.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ export class FileListItemComponent
396396

397397
switch (dragEvent.type) {
398398
case 'start':
399-
case 'end':
399+
case 'end': {
400400
const start = dragEvent.type === 'start';
401401

402402
if (this.item.isRecord && dragEvent.targetTypes.includes('record')) {
@@ -412,6 +412,7 @@ export class FileListItemComponent
412412
}
413413

414414
break;
415+
}
415416
}
416417
}
417418

src/app/file-browser/components/publish/publish.component.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,9 @@ export class PublishComponent {
9191
if (latest && latest.displayName === this.sourceItem.displayName) {
9292
this.publicItem = latest;
9393
} else {
94-
await new Promise<void>((r) => setTimeout(() => r(), 1000));
94+
await new Promise<void>((r) => {
95+
setTimeout(() => r(), 1000);
96+
});
9597
}
9698
}
9799

src/app/filesystem/permanent-filesystem.spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ describe('Permanent Filesystem (Folder Caching)', () => {
6969
// Simulate a backend change happening in another window/tab/client/etc.
7070
api.addFolder(new FolderVO({ folderId: 0, displayName: 'Updated Value' }));
7171
const folder = await fs.getFolder({ folderId: 0 });
72-
await new Promise((resolve) => setTimeout(resolve, 0));
72+
await new Promise<void>((resolve) => {
73+
setTimeout(resolve, 0);
74+
});
7375

7476
expect(folder.displayName).toBe('Updated Value');
7577
});

0 commit comments

Comments
 (0)