Merge remote-tracking branch 'upstream/dev' into feature-i18n

src/app/[orgId]/settings/access/roles/RolesTable.tsx

@@ -14,7 +14,7 @@ import ConfirmDeleteDialog from "@app/components/ConfirmDeleteDialog";
 import { useOrgContext } from "@app/hooks/useOrgContext";
 import { toast } from "@app/hooks/useToast";
 import { RolesDataTable } from "./RolesDataTable";
-import { Role } from "@server/db/schemas";
+import { Role } from "@server/db";
 import CreateRoleForm from "./CreateRoleForm";
 import DeleteRoleForm from "./DeleteRoleForm";
 import { createApiClient } from "@app/lib/api";

src/app/[orgId]/settings/api-keys/create/page.tsx

@@ -44,7 +44,7 @@ import {
     CreateOrgApiKeyBody,
     CreateOrgApiKeyResponse
 } from "@server/routers/apiKeys";
-import { ApiKey } from "@server/db/schemas";
+import { ApiKey } from "@server/db";
 import {
     InfoSection,
     InfoSectionContent,

src/app/[orgId]/settings/resources/[resourceId]/ResourceInfoBox.tsx

@@ -21,7 +21,7 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
     const { resource, authInfo, site } = useResourceContext();
     const api = createApiClient(useEnvContext());
 
-    const { isEnabled, isAvailable } = useDockerSocket(resource.siteId);
+    const { isEnabled, isAvailable } = useDockerSocket(site!);
     const t = useTranslations();
 
     let fullUrl = `${resource.ssl ? "https" : "http"}://${resource.fullDomain}`;
@@ -72,7 +72,7 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
                                     {resource.siteName}
                                 </InfoSectionContent>
                             </InfoSection>
-                            {isEnabled && (
+                            {/* {isEnabled && (
                                 <InfoSection>
                                     <InfoSectionTitle>Socket</InfoSectionTitle>
                                     <InfoSectionContent>
@@ -89,7 +89,7 @@ export default function ResourceInfoBox({}: ResourceInfoBoxType) {
                                         )}
                                     </InfoSectionContent>
                                 </InfoSection>
-                            )}
+                            )} */}
                         </>
                     ) : (
                         <>

src/app/[orgId]/settings/resources/[resourceId]/authentication/SetResourcePasswordForm.tsx

@@ -28,7 +28,7 @@ import {
 } from "@app/components/Credenza";
 import { formatAxiosError } from "@app/lib/api";
 import { AxiosResponse } from "axios";
-import { Resource } from "@server/db/schemas";
+import { Resource } from "@server/db";
 import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { useTranslations } from "next-intl";

src/app/[orgId]/settings/resources/[resourceId]/authentication/SetResourcePincodeForm.tsx

@@ -28,7 +28,7 @@ import {
 } from "@app/components/Credenza";
 import { formatAxiosError } from "@app/lib/api";
 import { AxiosResponse } from "axios";
-import { Resource } from "@server/db/schemas";
+import { Resource } from "@server/db";
 import {
     InputOTP,
     InputOTPGroup,

src/app/[orgId]/settings/resources/[resourceId]/proxy/page.tsx

@@ -771,7 +771,7 @@ export default function ReverseProxyTargets(props: {
                                                 <Input id="ip" {...field} />
                                             </FormControl>
                                             <FormMessage />
-                                            {site && (
+                                            {site && site.type == 'newt' && (
                                                 <ContainersSelector
                                                     site={site}
                                                     onContainerSelect={(

src/app/[orgId]/settings/resources/create/page.tsx

@@ -32,7 +32,7 @@ import { createApiClient } from "@app/lib/api";
 import { useEnvContext } from "@app/hooks/useEnvContext";
 import { toast } from "@app/hooks/useToast";
 import { AxiosResponse } from "axios";
-import { Resource } from "@server/db/schemas";
+import { Resource } from "@server/db";
 import { StrategySelect } from "@app/components/StrategySelect";
 import {
     Select,

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

@@ -130,31 +130,35 @@ export default function GeneralPage() {
                                         </FormItem>
                                     )}
                                 />
-                                <FormField
-                                    control={form.control}
-                                    name="dockerSocketEnabled"
-                                    render={({ field }) => (
-                                        <FormItem>
-                                            <FormControl>
-                                                <SwitchInput
-                                                    id="docker-socket-enabled"
-                                                    label="Enable Docker Socket"
-                                                    defaultChecked={field.value}
-                                                    onCheckedChange={
-                                                        field.onChange
-                                                    }
-                                                />
-                                            </FormControl>
-                                            <FormMessage />
-                                            <FormDescription>
-                                                Enable Docker Socket discovery
-                                                for populating container
-                                                information, useful in resource
-                                                targets.
-                                            </FormDescription>
-                                        </FormItem>
-                                    )}
-                                />
+                                {site && site.type === "newt" && (
+                                    <FormField
+                                        control={form.control}
+                                        name="dockerSocketEnabled"
+                                        render={({ field }) => (
+                                            <FormItem>
+                                                <FormControl>
+                                                    <SwitchInput
+                                                        id="docker-socket-enabled"
+                                                        label="Enable Docker Socket"
+                                                        defaultChecked={
+                                                            field.value
+                                                        }
+                                                        onCheckedChange={
+                                                            field.onChange
+                                                        }
+                                                    />
+                                                </FormControl>
+                                                <FormMessage />
+                                                <FormDescription>
+                                                    Enable Docker Socket
+                                                    discovery for populating
+                                                    container information,
+                                                    useful in resource targets.
+                                                </FormDescription>
+                                            </FormItem>
+                                        )}
+                                    />
+                                )}
                             </form>
                         </Form>
                     </SettingsSectionForm>

src/app/auth/idp/[idpId]/oidc/callback/page.tsx

@@ -1,7 +1,7 @@
 import { cookies } from "next/headers";
 import ValidateOidcToken from "./ValidateOidcToken";
-import { idp } from "@server/db/schemas";
-import db from "@server/db";
+import { idp } from "@server/db";
+import { db } from "@server/db";
 import { eq } from "drizzle-orm";
 import { getTranslations } from "next-intl/server";
 

src/app/auth/login/page.tsx

@@ -6,8 +6,8 @@ import DashboardLoginForm from "./DashboardLoginForm";
 import { Mail } from "lucide-react";
 import { pullEnv } from "@app/lib/pullEnv";
 import { cleanRedirect } from "@app/lib/cleanRedirect";
-import db from "@server/db";
-import { idp } from "@server/db/schemas";
+import { db } from "@server/db";
+import { idp } from "@server/db";
 import { LoginFormIDP } from "@app/components/LoginForm";
 import { getTranslations } from "next-intl/server";
 

src/app/auth/resource/[resourceId]/page.tsx

@@ -14,8 +14,8 @@ import ResourceAccessDenied from "./ResourceAccessDenied";
 import AccessToken from "./AccessToken";
 import { pullEnv } from "@app/lib/pullEnv";
 import { LoginFormIDP } from "@app/components/LoginForm";
-import db from "@server/db";
-import { idp } from "@server/db/schemas";
+import { db } from "@server/db";
+import { idp } from "@server/db";
 
 export default async function ResourceAuthPage(props: {
     params: Promise<{ resourceId: number }>;