Merge branch 'dev' into Lokowitz-feature-i18n

.github/dependabot.yml

@@ -13,10 +13,6 @@ updates:
         dependency-type: "development"
         update-types:
           - "minor"
-      dev-major-updates:
-        dependency-type: "development"
-        update-types:
-          - "major"
       prod-patch-updates:
         dependency-type: "production"
         update-types:
@@ -25,10 +21,6 @@ updates:
         dependency-type: "production"
         update-types:
           - "minor"
-      prod-major-updates:
-        dependency-type: "production"
-        update-types:
-          - "major"
           
   - package-ecosystem: "docker"
     directory: "/"
@@ -41,6 +33,3 @@ updates:
       minor-updates:
         update-types:
           - "minor"
-      major-updates:
-        update-types:
-          - "major"

.gitignore

@@ -32,5 +32,4 @@ installer
 bin
 .secrets
 test_event.json
-.idea/
+.idea/
-package-lock.json

package.json

@@ -106,7 +106,7 @@
         "winston": "3.17.0",
         "winston-daily-rotate-file": "5.0.0",
         "ws": "8.18.2",
-        "zod": "3.25.46",
+        "zod": "3.25.56",
         "zod-validation-error": "3.4.1"
     },
     "devDependencies": {
@@ -114,8 +114,8 @@
         "@esbuild-plugins/tsconfig-paths": "0.1.2",
         "@tailwindcss/postcss": "^4.1.8",
         "@types/better-sqlite3": "7.6.12",
-        "@types/cookie-parser": "1.4.8",
+        "@types/cookie-parser": "1.4.9",
-        "@types/cors": "2.8.18",
+        "@types/cors": "2.8.19",
         "@types/crypto-js": "^4.2.2",
         "@types/express": "5.0.0",
         "@types/jmespath": "^0.15.2",
@@ -124,7 +124,7 @@
         "@types/node": "^22",
         "@types/nodemailer": "6.4.17",
         "@types/react": "19.1.6",
-        "@types/react-dom": "19.1.5",
+        "@types/react-dom": "19.1.6",
         "@types/semver": "7.7.0",
         "@types/swagger-ui-express": "^4.1.8",
         "@types/ws": "8.18.1",
@@ -133,7 +133,7 @@
         "esbuild": "0.25.5",
         "esbuild-node-externals": "1.18.0",
         "postcss": "^8",
-        "react-email": "4.0.15",
+        "react-email": "4.0.16",
         "tailwindcss": "^4.1.4",
         "tsc-alias": "1.8.16",
         "tsx": "4.19.4",

server/lib/consts.ts

@@ -2,7 +2,7 @@ import path from "path";
 import { fileURLToPath } from "url";
 
 // This is a placeholder value replaced by the build process
-export const APP_VERSION = "1.5.0";
+export const APP_VERSION = "1.5.1";
 
 export const __FILENAME = fileURLToPath(import.meta.url);
 export const __DIRNAME = path.dirname(__FILENAME);

src/app/[orgId]/settings/sites/SitesTable.tsx

@@ -28,6 +28,7 @@ import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import CreateSiteFormModal from "./CreateSiteModal";
 import { useTranslations } from "next-intl";
+import { parseDataSize } from '@app/lib/dataSize';
 
 export type SiteRow = {
     id: number;
@@ -199,7 +200,9 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
                         <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
-            }
+            },
+            sortingFn: (rowA, rowB) => 
+                parseDataSize(rowA.original.mbIn) - parseDataSize(rowB.original.mbIn)
         },
         {
             accessorKey: "mbOut",
@@ -215,7 +218,9 @@ export default function SitesTable({ sites, orgId }: SitesTableProps) {
                         <ArrowUpDown className="ml-2 h-4 w-4" />
                     </Button>
                 );
-            }
+            },
+            sortingFn: (rowA, rowB) =>
+                parseDataSize(rowA.original.mbOut) - parseDataSize(rowB.original.mbOut),
         },
         {
             accessorKey: "type",

src/app/[orgId]/settings/sites/[niceId]/general/page.tsx

@@ -33,6 +33,15 @@ import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useState } from "react";
 import { SwitchInput } from "@app/components/SwitchInput";
 import { useTranslations } from "next-intl";
+import Link from "next/link";
+import { ArrowRight } from "lucide-react";
+
+const GeneralFormSchema = z.object({
+    name: z.string().nonempty("Name is required"),
+    dockerSocketEnabled: z.boolean().optional()
+});
+
+type GeneralFormValues = z.infer<typeof GeneralFormSchema>;
 
 export default function GeneralPage() {
     const { site, updateSite } = useSiteContext();
@@ -154,6 +163,20 @@ export default function GeneralPage() {
                                                     discovery for populating
                                                     container information,
                                                     useful in resource targets.
+                                                    <Link
+                                                        href="https://docs.fossorial.io/Newt/overview#docker-socket-integration"
+                                                        target="_blank"
+                                                        rel="noopener noreferrer"
+                                                        className="underline"
+                                                    >
+                                                        <span>
+                                                            {" "}
+                                                            Docker socket path
+                                                            must be provided to
+                                                            Newt in order to use
+                                                            this feature.
+                                                        </span>
+                                                    </Link>
                                                 </FormDescription>
                                             </FormItem>
                                         )}

src/app/setup/page.tsx

@@ -84,7 +84,14 @@ export default function StepperForm() {
     );
 
     const generateId = (name: string) => {
-        return name.toLowerCase().replace(/\s+/g, "-");
+        // Replace any character that is not a letter, number, space, or hyphen with a hyphen
+        // Also collapse multiple hyphens and trim
+        return name
+            .toLowerCase()
+            .replace(/[^a-z0-9\s-]/g, "-")
+            .replace(/\s+/g, "-")
+            .replace(/-+/g, "-")
+            .replace(/^-+|-+$/g, "");
     };
 
     async function orgSubmit(values: z.infer<typeof orgSchema>) {
@@ -209,23 +216,22 @@ export default function StepperForm() {
                                                         type="text"
                                                         {...field}
                                                         onChange={(e) => {
-                                                            const orgId =
+                                                            // Prevent "/" in orgName input
-                                                                generateId(
+                                                            const sanitizedValue = e.target.value.replace(/\//g, "-");
-                                                                    e.target
+                                                            const orgId = generateId(sanitizedValue);
-                                                                        .value
-                                                                );
                                                             orgForm.setValue(
                                                                 "orgId",
                                                                 orgId
                                                             );
                                                             orgForm.setValue(
                                                                 "orgName",
-                                                                e.target.value
+                                                                sanitizedValue
                                                             );
                                                             debouncedCheckOrgIdAvailability(
                                                                 orgId
                                                             );
                                                         }}
+                                                        value={field.value.replace(/\//g, "-")}
                                                     />
                                                 </FormControl>
                                                 <FormMessage />

src/components/ContainersSelector.tsx

@@ -346,16 +346,19 @@ const DockerContainersTable: FC<{
         {
             id: "actions",
             header: "Actions",
-            cell: ({ row }) => (
+            cell: ({ row }) => {
-                <Button
+                const ports = getExposedPorts(row.original);
-                    variant="default"
+                return (
-                    size="sm"
+                    <Button
-                    onClick={() => onContainerSelect(row.original)}
+                        variant="default"
-                    disabled={row.original.state !== "running"}
+                        size="sm"
-                >
+                        onClick={() => onContainerSelect(row.original, ports[0])}
-                    Select
+                        disabled={row.original.state !== "running"}
-                </Button>
+                    >
-            )
+                        Select
+                    </Button>
+                );
+            }
         }
     ];
 

src/hooks/useDockerSocket.ts

@@ -21,7 +21,8 @@ export function useDockerSocket(site: Site) {
 
     const api = createApiClient(useEnvContext());
 
-    const { dockerSocketEnabled: isEnabled = true } = site || {};
+    const { dockerSocketEnabled: rawIsEnabled = true, type: siteType } = site || {};
+    const isEnabled = rawIsEnabled && siteType === "newt";
     const { isAvailable = false, socketPath } = dockerSocket || {};
 
     const checkDockerSocket = useCallback(async () => {

src/lib/dataSize.ts

@@ -0,0 +1,21 @@
+export function parseDataSize(sizeStr: string): number {
+  if (typeof sizeStr !== 'string') return 0;
+
+  const match = /^\s*([\d.]+)\s*([KMGT]?B)\s*$/i.exec(sizeStr);
+  if (!match) return 0;
+
+  const [ , numStr, unitRaw ] = match;
+  const num = parseFloat(numStr);
+  if (isNaN(num)) return 0;
+
+  const unit = unitRaw.toUpperCase();
+  const multipliers = {
+    B: 1,
+    KB: 1024,
+    MB: 1024 ** 2,
+    GB: 1024 ** 3,
+    TB: 1024 ** 4,
+  } as const;
+
+  return num * (multipliers[unit as keyof typeof multipliers] ?? 1);
+}