Browse Source

Merge remote-tracking branch 'refs/remotes/upstream/main' into fix/consistent-indexed-object-style

# Conflicts:
#	.eslintrc.json
#	apps/client/src/app/components/admin-jobs/admin-jobs.component.ts
pull/3986/head
dw-0 10 months ago
parent
commit
e043835012
  1. 1
      CHANGELOG.md
  2. 3
      apps/client/src/app/components/admin-jobs/admin-jobs.component.ts

1
CHANGELOG.md

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Switched the `consistent-generic-constructors` rule from `warn` to `error` in the `eslint` configuration
- Switched the `consistent-type-assertions` rule from `warn` to `error` in the `eslint` configuration
- Switched the `prefer-optional-chain` rule from `warn` to `error` in the `eslint` configuration
- Switched the `consistent-generic-constructors` rule from `warn` to `error` in the `eslint` configuration

3
apps/client/src/app/components/admin-jobs/admin-jobs.component.ts

@ -35,9 +35,10 @@ export class AdminJobsComponent implements OnDestroy, OnInit {
DATA_GATHERING_QUEUE_PRIORITY_HIGH;
public DATA_GATHERING_QUEUE_PRIORITY_MEDIUM =
DATA_GATHERING_QUEUE_PRIORITY_MEDIUM;
public dataSource = new MatTableDataSource<AdminJobs['jobs'][0]>();
public defaultDateTimeFormat: string;
public filterForm: FormGroup;
public dataSource = new MatTableDataSource<AdminJobs['jobs'][0]>();
public displayedColumns = [
'index',
'type',

Loading…
Cancel
Save