Skip to content

Commit 689b6af

Browse files
committed
feat: remove unused inspector config components; restore inspector bar color select
1 parent 114e76b commit 689b6af

12 files changed

Lines changed: 75 additions & 1258 deletions

File tree

src/app/(private)/(dashboards)/superadmin/data-sources/[id]/components/InspectorConfigSection.tsx

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ import { GripVertical, LayoutGrid, LayoutList } from "lucide-react";
1313
import { useCallback, useMemo } from "react";
1414
import { v4 as uuidv4 } from "uuid";
1515
import ColumnMetadataIcons from "@/app/(private)/map/[id]/components/ColumnMetadataIcons";
16-
import { INSPECTOR_COLOR_OPTIONS } from "@/app/(private)/map/[id]/components/InspectorPanel/inspectorPanelOptions";
16+
import {
17+
DEFAULT_BAR_COLOR_VALUE,
18+
INSPECTOR_BAR_COLOR_OPTIONS,
19+
INSPECTOR_COLOR_OPTIONS,
20+
} from "@/app/(private)/map/[id]/components/InspectorPanel/inspectorPanelOptions";
1721
import { useDataSourceColumn } from "@/app/(private)/map/[id]/hooks/useDataSourceColumn";
1822
import { useInspectorColumn } from "@/app/(private)/map/[id]/hooks/useInspectorColumn";
1923
import { NULL_UUID } from "@/constants";
@@ -580,6 +584,24 @@ function ColumnItemRow({
580584
</select>
581585
)}
582586

587+
{inspectorColumn?.displayFormat === ColumnDisplayFormat.Percentage && (
588+
<select
589+
className="h-6 rounded border border-input bg-background px-1.5 text-xs"
590+
value={inspectorColumn?.barColor ?? DEFAULT_BAR_COLOR_VALUE}
591+
onChange={(e) =>
592+
onUpdate({
593+
barColor: e.target.value,
594+
})
595+
}
596+
>
597+
{INSPECTOR_BAR_COLOR_OPTIONS.map((o) => (
598+
<option key={o.value} value={o.value}>
599+
{o.label}
600+
</option>
601+
))}
602+
</select>
603+
)}
604+
583605
{inspectorColumn?.displayFormat === ColumnDisplayFormat.Scale && (
584606
<input
585607
type="number"

src/app/(private)/map/[id]/components/InspectorPanel/DataRecordColumns.tsx

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { formatNumber } from "@/utils/text";
88
import { PARTY_COLORS } from "../../constants";
99
import { useDataSourceColumn } from "../../hooks/useDataSourceColumn";
1010
import { useInspectorColumn } from "../../hooks/useInspectorColumn";
11+
import { useInspectorDataSourceConfig } from "../../hooks/useInspectorDataSourceConfig";
1112
import { getDisplayValue, parseColumnNumber } from "../../utils/stats";
1213
import { getBarColorForLabel } from "./inspectorPanelOptions";
1314
import { PropertyLabel } from "./PropertyLabel";
@@ -61,6 +62,7 @@ interface SubRendererProps {
6162
dataSourceId: string | undefined;
6263
columnMetadata?: ColumnMetadata | undefined;
6364
columnType?: ColumnType | null;
65+
inspectorColor?: string | null;
6466
}
6567

6668
function TextOrNumberValue({
@@ -189,17 +191,19 @@ function PercentageBarValue({
189191
value,
190192
inspectorColumn,
191193
columnMetadata,
194+
inspectorColor,
192195
}: Omit<SubRendererProps, "dataSourceId" | "columnType">) {
193196
const num = parseColumnNumber(value, {
194197
isCount: false,
195198
columnMetadata,
196199
});
197200
const fill = barFill(
198-
getBarColorForLabel(
199-
inspectorColumn.name,
200-
columnMetadata?.displayName,
201-
inspectorColumn.barColor,
202-
),
201+
getBarColorForLabel({
202+
columnName: inspectorColumn.name,
203+
displayName: columnMetadata?.displayName,
204+
barColor: inspectorColumn.barColor,
205+
inspectorColor,
206+
}),
203207
);
204208

205209
if (num === null) {
@@ -229,17 +233,19 @@ function ScaleValue({
229233
value,
230234
inspectorColumn,
231235
columnMetadata,
236+
inspectorColor,
232237
}: Omit<SubRendererProps, "dataSourceId" | "columnType">) {
233238
const num = parseColumnNumber(value, {
234239
isCount: false,
235240
columnMetadata,
236241
});
237242
const fill = barFill(
238-
getBarColorForLabel(
239-
inspectorColumn.name,
240-
columnMetadata?.displayName,
241-
inspectorColumn.barColor,
242-
),
243+
getBarColorForLabel({
244+
columnName: inspectorColumn.name,
245+
displayName: columnMetadata?.displayName,
246+
barColor: inspectorColumn.barColor,
247+
inspectorColor,
248+
}),
243249
);
244250

245251
if (num === null) {
@@ -275,6 +281,7 @@ function DataRecordPropertyValue({
275281
}) {
276282
const { columnMetadata, columnDef } = useDataSourceColumn(dataSourceId, name);
277283
const inspectorColumn = useInspectorColumn(dataSourceId, name);
284+
const inspectorConfig = useInspectorDataSourceConfig(dataSourceId);
278285

279286
const format = inspectorColumn?.displayFormat;
280287

@@ -310,6 +317,7 @@ function DataRecordPropertyValue({
310317
value={value}
311318
inspectorColumn={inspectorColumn}
312319
columnMetadata={columnMetadata}
320+
inspectorColor={inspectorConfig?.color}
313321
/>
314322
);
315323
}
@@ -320,6 +328,7 @@ function DataRecordPropertyValue({
320328
value={value}
321329
inspectorColumn={inspectorColumn}
322330
columnMetadata={columnMetadata}
331+
inspectorColor={inspectorConfig?.color}
323332
/>
324333
);
325334
}

src/app/(private)/map/[id]/components/InspectorPanel/InspectorSettingsModal/AvailableColumnRow.tsx

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/app/(private)/map/[id]/components/InspectorPanel/InspectorSettingsModal/AvailableListWithDividers.tsx

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)