Skip to content

Rename a column to the more generic "device" #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jona159 merged 2 commits into from
Mar 25, 2026
Merged

Rename a column to the more generic "device" #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9769721
refactor: show support link only for senseboxes, rename column to device
scheidtdav Mar 25, 2026
28ea4ea
Merge branch 'dev' into feat/renaming
scheidtdav Mar 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions app/components/header/menu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Globe,
LogIn,
LogOut,
Puzzle,

Check warning on line 5 in app/components/header/menu/index.tsx

View workflow job for this annotation

GitHub Actions / ⬣ Lint 

'Puzzle' is defined but never used. Allowed unused vars must match /^ignored/u
Menu as MenuIcon,
FileLock2,
Coins,
Expand Down Expand Up @@ -129,14 +129,6 @@
</DropdownMenuGroup>
)}
<DropdownMenuGroup>
<Link to="https://docs.sensebox.de/" target="_blank">
<DropdownMenuItem className="cursor-pointer">
<Puzzle className="mr-2 h-5 w-5" />
<span>{t('tutorials_label')}</span>
<ExternalLink className="ml-auto h-4 w-4 text-gray-300" />
</DropdownMenuItem>
</Link>

<Link to="https://docs.opensensemap.org/" target="_blank">
<DropdownMenuItem className="cursor-pointer">
<Globe className="mr-2 h-5 w-5" />
Expand All @@ -155,12 +147,7 @@
</Link>
</DropdownMenuGroup>
<DropdownMenuGroup>
<Link
to={
'/terms'
}
target="_blank"
>
<Link to={'/terms'} target="_blank">
<DropdownMenuItem
onSelect={(e) => e.preventDefault()}
className="cursor-pointer"
Expand Down
25 changes: 15 additions & 10 deletions app/components/mydevices/dt/columns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export type SenseBox = {
exposure: Device['exposure']
createdAt: Date
archivedAt: Date | null
model: Device['model']
// model: string;
}

Expand Down Expand Up @@ -129,7 +130,7 @@ export function getColumns(
{
accessorKey: 'id',
header: () => (
<div className="pl-0 dark:text-white">{t('sensebox_id')}</div>
<div className="pl-0 dark:text-white">{t('device_id')}</div>
),
cell: ({ row }) => {
const device = row.original
Expand Down Expand Up @@ -195,15 +196,19 @@ export function getColumns(
</a>
)}
</DropdownMenuItem>
<DropdownMenuItem disabled={isArchived} asChild>
<a
href="https://sensebox.de/de/go-home"
target="_blank"
rel="noopener noreferrer"
>
{t('support')}
</a>
</DropdownMenuItem>
{((device.model?.toLowerCase() ?? '').indexOf('sensebox') >=
0 ||
(device.model?.toLowerCase() ?? '').indexOf('home') >= 0) && (
<DropdownMenuItem disabled={isArchived} asChild>
<a
href="https://sensebox.de/de/go-home"
target="_blank"
rel="noopener noreferrer"
>
{t('support')}
</a>
</DropdownMenuItem>
)}
<DropdownMenuItem
asChild
onClick={() => navigator.clipboard.writeText(device.id)}
Expand Down
2 changes: 1 addition & 1 deletion public/locales/de/data-table.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"next_page": "Nächste Seite",
"last_page": "Letzte Seite",

"sensebox_id": "Sensebox ID",
"device_id": "Device ID",
"actions": "Aktionen",
"name": "Name",
"createdAt": "Erstellt am",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/data-table.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"next_page": "Next page",
"last_page": "Last page",

"sensebox_id": "Sensebox ID",
"device_id": "Device ID",
"actions": "Actions",
"name": "Name",
"createdAt": "Created at",
Expand Down
Loading