Merge pull request 'clan-app: ui-2d remove unecessary imports' (#4032) from Qubasa/clan-core:ui-2d-logs into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/4032

pkgs/clan-app/ui-2d/package.json

@@ -9,8 +9,8 @@
     "build": "npm run check && npm run test && vite build && npm run convert-html",
     "convert-html": "node gtk.webview.js",
     "serve": "vite preview",
-    "check": "tsc --noEmit --skipLibCheck && eslint ./src",
+    "check": "tsc --noEmit --skipLibCheck && eslint ./src --fix",
-    "knip": "knip",
+    "knip": "knip --fix",
     "test": "vitest run --project unit --typecheck",
     "storybook": "storybook",
     "storybook-build": "storybook build",

pkgs/clan-app/ui-2d/src/Form/fields/TextInput.tsx

@@ -5,7 +5,6 @@ import {
   InputLabel,
   InputVariant,
 } from "@/src/components/inputBase";
-import { Typography } from "@/src/components/Typography";
 import { FieldLayout } from "./layout";
 
 interface TextInputProps {

pkgs/clan-app/ui-2d/src/api/index.tsx

@@ -1,8 +1,6 @@
-import schema from "@/api/API.json" with { type: "json" };
+import { API } from "@/api/API";
-import { API, Error as ApiError } from "@/api/API";
-import { nanoid } from "nanoid";
 import { Schema as Inventory } from "@/api/Inventory";
-import { toast, Toast } from "solid-toast";
+import { toast } from "solid-toast";
 import {
   ErrorToastComponent,
   CancelToastComponent,

pkgs/clan-app/ui-2d/src/components/RemoteForm.tsx

@@ -5,7 +5,7 @@ import { TextInput } from "@/src/Form/fields/TextInput";
 import { SelectInput } from "@/src/Form/fields/Select";
 import { FileInput } from "@/src/components/FileInput";
 import { FieldLayout } from "@/src/Form/fields/layout";
-import { InputLabel, InputBase } from "@/src/components/inputBase";
+import { InputLabel } from "@/src/components/inputBase";
 import Icon from "@/src/components/icon";
 import { Loader } from "@/src/components/v2/Loader/Loader";
 import { Button } from "@/src/components/v2/Button/Button";

pkgs/clan-app/ui-2d/src/components/fileSelect/index.tsx

@@ -1,9 +1,8 @@
 import { FileInput, type FileInputProps } from "@/src/components/FileInput"; // Assuming FileInput can take a ref and has onClick
 import { Typography } from "@/src/components/Typography";
 import Fieldset from "@/src/Form/fieldset";
-import Icon from "@/src/components/icon"; // For displaying file icons
+// For displaying file icons
 import { callApi } from "@/src/api";
-import type { FieldValues } from "@modular-forms/solid";
 import { Show, For, type Component, type JSX } from "solid-js";
 
 // Types for the file dialog options passed to callApi

pkgs/clan-app/ui-2d/src/contexts/clan.tsx

@@ -1,5 +1,4 @@
 import { createContext, createEffect, JSX, useContext } from "solid-js";
-import { callApi } from "@/src/api";
 import {
   activeClanURI,
   addClanURI,

pkgs/clan-app/ui-2d/src/index.tsx

@@ -13,7 +13,6 @@ import {
 import { Layout } from "./layout/layout";
 import { ClanDetails, ClanList, CreateClan } from "./routes/clans";
 import { Flash } from "./routes/flash/view";
-import { HostList } from "./routes/hosts/view";
 import { Welcome } from "./routes/welcome";
 import { Toaster } from "solid-toast";
 import { ModuleList } from "./routes/modules/list";
@@ -21,7 +20,6 @@ import { ModuleDetails } from "./routes/modules/details";
 import { ModuleDetails as AddModule } from "./routes/modules/add";
 import { ApiTester } from "./api_test";
 import { IconVariant } from "./components/icon";
-import { Components } from "./routes/components";
 import { VarsPage } from "./routes/machines/install/vars-step";
 import { ClanProvider } from "./contexts/clan";
 

pkgs/clan-app/ui-2d/src/queries/index.ts

@@ -1,6 +1,5 @@
 import { useQuery } from "@tanstack/solid-query";
 import { callApi } from "../api";
-import toast from "solid-toast";
 
 interface ModulesFilter {
   features: string[];

pkgs/clan-app/ui-2d/src/routes/clans/details.tsx

@@ -1,17 +1,8 @@
-import { callApi, ClanServiceInstance, SuccessQuery } from "@/src/api";
+import { callApi, SuccessQuery } from "@/src/api";
 import { useParams } from "@solidjs/router";
-import { createQuery, useQueryClient } from "@tanstack/solid-query";
+import { useQueryClient } from "@tanstack/solid-query";
-import { createSignal, For, Match, Switch } from "solid-js";
+import { Match, Switch } from "solid-js";
-import {
+import { createForm, required, SubmitHandler } from "@modular-forms/solid";
-  createForm,
-  FieldValues,
-  getValue,
-  getValues,
-  required,
-  setValue,
-  SubmitHandler,
-} from "@modular-forms/solid";
-import { TextInput } from "@/src/Form/fields/TextInput";
 import toast from "solid-toast";
 import { Button } from "../../components/Button/Button";
 import Icon from "@/src/components/icon";

pkgs/clan-app/ui-2d/src/routes/flash/view.tsx

@@ -15,7 +15,7 @@ import {
   getValues,
 } from "@modular-forms/solid";
 import { createQuery } from "@tanstack/solid-query";
-import { createEffect, createSignal, For, Show } from "solid-js"; // For, Show might not be needed directly here now
+import { createEffect, createSignal } from "solid-js"; // For, Show might not be needed directly here now
 import toast from "solid-toast";
 import { FieldLayout } from "@/src/Form/fields/layout";
 import { InputLabel } from "@/src/components/inputBase";

pkgs/clan-app/ui-2d/src/routes/machines/components/MachineActionsBar.tsx

@@ -12,10 +12,10 @@ export function MachineActionsBar(props: MachineActionsBarProps) {
   return (
     <div class="sticky top-0 flex items-center justify-end gap-2 border-b border-secondary-100 bg-secondary-50 px-4 py-2">
       <div class="flex items-center gap-3">
-        <div class="button-group flex flex-shrink-0 min-w-0">
+        <div class="button-group flex min-w-0 shrink-0">
           <Button
             variant="light"
-            class="flex-1 min-w-0"
+            class="min-w-0 flex-1"
             size="s"
             onClick={props.onInstall}
             endIcon={<Icon size={14} icon="Flash" />}
@@ -24,7 +24,7 @@ export function MachineActionsBar(props: MachineActionsBarProps) {
           </Button>
           <Button
             variant="light"
-            class="flex-1 min-w-0"
+            class="min-w-0 flex-1"
             size="s"
             onClick={props.onUpdate}
             endIcon={<Icon size={14} icon="Update" />}
@@ -33,7 +33,7 @@ export function MachineActionsBar(props: MachineActionsBarProps) {
           </Button>
           <Button
             variant="light"
-            class="flex-1 min-w-0"
+            class="min-w-0 flex-1"
             size="s"
             onClick={props.onCredentials}
             endIcon={<Icon size={14} icon="Folder" />}

pkgs/clan-app/ui-2d/src/routes/machines/components/MachineForm.tsx

@@ -1,8 +1,8 @@
-import { callApi, SuccessData, OperationResponse } from "@/src/api";
+import { callApi, OperationResponse } from "@/src/api";
-import { createForm, getValue, ResponseData } from "@modular-forms/solid";
+import { createForm, ResponseData } from "@modular-forms/solid";
 import { useNavigate } from "@solidjs/router";
 import { useQuery, useQueryClient } from "@tanstack/solid-query";
-import { createEffect, createSignal } from "solid-js";
+import { createSignal } from "solid-js";
 import { Button } from "@/src/components/Button/Button";
 import { useClanContext } from "@/src/contexts/clan";
 import { MachineAvatar } from "./MachineAvatar";
@@ -10,8 +10,6 @@ import toast from "solid-toast";
 import { MachineActionsBar } from "./MachineActionsBar";
 import { MachineGeneralFields } from "./MachineGeneralFields";
 import { MachineHardwareInfo } from "./MachineHardwareInfo";
-import { InstallMachine } from "./InstallMachine";
-import { debug } from "console";
 
 type DetailedMachineType = Extract<
   OperationResponse<"get_machine_details">,

pkgs/clan-app/ui-2d/src/routes/machines/components/MachineGeneralFields.tsx

@@ -1,11 +1,9 @@
 import {
   Field,
-  FieldValues,
   FormStore,
   ResponseData,
   FieldStore,
   FieldElementProps,
-  FieldPath,
 } from "@modular-forms/solid";
 import { TextInput } from "@/src/Form/fields/TextInput";
 import { Typography } from "@/src/components/Typography";

pkgs/clan-app/ui-2d/src/routes/machines/components/MachineHardwareInfo.tsx

@@ -1,6 +1,5 @@
 import {
   Field,
-  FieldValues,
   FormStore,
   ResponseData,
   FieldStore,

pkgs/clan-app/ui-2d/src/routes/machines/install/hardware-step.tsx

@@ -6,7 +6,6 @@ import { FieldLayout } from "@/src/Form/fields/layout";
 import {
   createForm,
   FieldValues,
-  getValue,
   required,
   setValue,
   submit,
@@ -18,11 +17,7 @@ import { useQuery } from "@tanstack/solid-query";
 import { Badge } from "@/src/components/badge";
 import { Group } from "@/src/components/group";
 import { useClanContext } from "@/src/contexts/clan";
-import {
+import { RemoteForm, type RemoteData } from "@/src/components/RemoteForm";
-  RemoteForm,
-  type RemoteData,
-  HostKeyCheck,
-} from "@/src/components/RemoteForm";
 
 export type HardwareValues = FieldValues & {
   report: boolean;

pkgs/clan-app/ui-2d/ui-2d.code-workspace

@@ -0,0 +1,28 @@
+{
+	"folders": [
+		{
+			"path": "."
+		},
+		{
+			"path": "../../clan-cli"
+		},
+		{
+			"path": "../clan_app"
+		}
+	],
+	"settings": {
+		"typescript.tsdk": "node_modules/typescript/lib",
+		"files.exclude": {
+			"**/.fonts": true,
+			"**/.claude": true,
+			"**/.vscode": true,
+			"**/tests": true,
+			"**/node_modules": true,
+			"**/icons": true,
+			"**/dist": true,
+			"*.js": true,
+			"*.json": true,
+			"tailwind": true,
+		}
+	}
+}