Skip to content

Commit f29b33e

Browse files
add back linting prettier via eslint (#1463)
1 parent a96dfae commit f29b33e

5 files changed

Lines changed: 14 additions & 5 deletions

File tree

‎.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,13 @@
77
"source.fixAll.eslint": "always",
88
"source.fixAll.stylelint": "always"
99
},
10+
"eslint.useFlatConfig": true,
11+
"[typescript]": {
12+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
13+
},
14+
"[typescriptreact]": {
15+
"editor.defaultFormatter": "dbaeumer.vscode-eslint"
16+
},
1017
"[scss]": {
1118
"editor.defaultFormatter": "stylelint.vscode-stylelint"
1219
},

‎packages/app/eslint.config.mjs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import reactPlugin from 'eslint-plugin-react';
66
import reactHooksPlugin from 'eslint-plugin-react-hooks';
77
import prettierConfig from 'eslint-config-prettier';
88
import simpleImportSort from 'eslint-plugin-simple-import-sort';
9+
import prettierPlugin from 'eslint-plugin-prettier/recommended';
910

1011
export default [
1112
js.configs.recommended,
1213
...tseslint.configs.recommended,
1314
prettierConfig,
15+
prettierPlugin,
1416
{
1517
ignores: [
1618
'playwright-report/**',

‎packages/app/src/DBDashboardPage.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,9 @@ function DBDashboardPage({ presetConfig }: { presetConfig?: Dashboard }) {
699699
dateRange={searchedTimeRange}
700700
onEditClick={() => setEditedTile(chart)}
701701
granularity={
702-
isRefreshEnabled ? granularityOverride : granularity ?? undefined
702+
isRefreshEnabled
703+
? granularityOverride
704+
: (granularity ?? undefined)
703705
}
704706
filters={[
705707
{

‎packages/app/src/ServicesDashboardPage.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,9 +631,7 @@ function HttpTab({
631631
selectGroupBy: false,
632632
groupBy: expressions.endpoint,
633633
orderBy: '"Total (ms)" DESC',
634-
filters: [
635-
...getScopedFilters({ appliedConfig, expressions }),
636-
],
634+
filters: [...getScopedFilters({ appliedConfig, expressions })],
637635
dateRange: searchedTimeRange,
638636
numberFormat: MS_NUMBER_FORMAT,
639637
limit: { limit: 20 },

‎packages/app/src/components/DBListBarChart.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ function ListBar({
122122
</Text>
123123
<Text size="xs" span>
124124
{column.numberFormat != null
125-
? formatNumber(value, column.numberFormat) ?? 'N/A'
125+
? (formatNumber(value, column.numberFormat) ?? 'N/A')
126126
: value}
127127
</Text>
128128
</Box>

0 commit comments

Comments
 (0)