-
Value
+
+ Value
+
setValue(e.target.value)}
className="font-mono text-sm"
@@ -106,10 +121,10 @@ export function EditSecretDialog({
onClick={() => onOpenChange(false)}
disabled={isSaving}
>
- Cancel
+
Cancel
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EditSecretDialog/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EditSecretDialog/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EditSecretDialog/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EditSecretDialog/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/EnvironmentVariablesList.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/EnvironmentVariablesList.tsx
similarity index 87%
rename from apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/EnvironmentVariablesList.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/EnvironmentVariablesList.tsx
index 21395cdf0c9..e28da2b8fd5 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/EnvironmentVariablesList.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/EnvironmentVariablesList.tsx
@@ -1,5 +1,7 @@
+import type { MessageDescriptor } from "@lingui/core";
import { msg } from "@lingui/core/macro";
import { useLingui as useTranslation } from "@lingui/react";
+import { Trans } from "@lingui/react/macro";
import { Button } from "@superset/ui/button";
import { Input } from "@superset/ui/input";
import {
@@ -30,10 +32,10 @@ interface Secret {
type SortOrder = "last-updated" | "name" | "type";
-const SORT_OPTIONS: { value: SortOrder; label: string }[] = [
- { value: "last-updated", label: "Last Updated" },
- { value: "name", label: "Name" },
- { value: "type", label: "Type" },
+const SORT_OPTIONS: { value: SortOrder; label: MessageDescriptor }[] = [
+ { value: "last-updated", label: msg({ message: "Last Updated" }) },
+ { value: "name", label: msg({ message: "Name", context: "sort order" }) },
+ { value: "type", label: msg({ message: "Type", context: "sort order" }) },
];
function sortSecrets(secrets: Secret[], order: SortOrder): Secret[] {
@@ -108,7 +110,7 @@ export function EnvironmentVariablesList({
@@ -134,7 +136,7 @@ export function EnvironmentVariablesList({
{SORT_OPTIONS.map((opt) => (
- {opt.label}
+ {translate(opt.label)}
))}
@@ -146,8 +148,8 @@ export function EnvironmentVariablesList({
{secrets.length === 0
- ? "No environment variables yet"
- : "No matching variables"}
+ ? translate(msg({ message: "No environment variables yet" }))
+ : translate(msg({ message: "No matching variables" }))}
) : (
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/components/SecretRow/SecretRow.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/components/SecretRow/SecretRow.tsx
similarity index 87%
rename from apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/components/SecretRow/SecretRow.tsx
rename to apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/components/SecretRow/SecretRow.tsx
index 23efc7cbc8c..cd5963d0094 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/components/SecretRow/SecretRow.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/components/SecretRow/SecretRow.tsx
@@ -1,4 +1,6 @@
-import { Trans } from "@lingui/react/macro";
+import { Trans, useLingui } from "@lingui/react/macro";
+import { errorMessage } from "@superset/i18n/errors";
+import { formatDate } from "@superset/i18n/format";
import {
AlertDialog,
AlertDialogAction,
@@ -20,7 +22,6 @@ import {
import { toast } from "@superset/ui/sonner";
import { Tooltip, TooltipContent, TooltipTrigger } from "@superset/ui/tooltip";
import { cn } from "@superset/ui/utils";
-import { format } from "date-fns";
import { useCallback, useState } from "react";
import {
HiEllipsisHorizontal,
@@ -53,6 +54,7 @@ export function SecretRow({
onEdit,
onDeleted,
}: SecretRowProps) {
+ const { t } = useLingui();
const [isRevealed, setIsRevealed] = useState(false);
const [isDeleting, setIsDeleting] = useState(false);
const [confirmingDelete, setConfirmingDelete] = useState(false);
@@ -70,12 +72,15 @@ export function SecretRow({
} catch (err) {
console.error("[secrets/delete] Failed to delete:", err);
toast.error(
- err instanceof Error ? err.message : "Failed to delete secret",
+ errorMessage(
+ err,
+ t({ message: "Failed to delete environment variable" }),
+ ),
);
} finally {
setIsDeleting(false);
}
- }, [secret.key, environmentId, onDeleted]);
+ }, [secret.key, environmentId, onDeleted, t]);
const { copyToClipboard, copied } = useCopyToClipboard(1500);
const handleCopy = useCallback(() => {
@@ -83,6 +88,10 @@ export function SecretRow({
}, [secret.value, copyToClipboard]);
const isEmpty = !secret.sensitive && !secret.value;
+ const addedOn = formatDate(secret.createdAt, {
+ month: "short",
+ day: "numeric",
+ });
return (
{secret.sensitive && (
- Sensitive
+ Sensitive
)}
@@ -113,7 +122,9 @@ export function SecretRow({
{!secret.sensitive &&
(isEmpty ? (
- Empty
+
+ Empty
+
) : (
<>
-
Added {format(new Date(secret.createdAt), "MMM d")}
+
+ Added {addedOn}
+
{secret.createdBy && (
{!secret.sensitive && (
- Edit
+
+ Edit
+
)}
setConfirmingDelete(true)}
variant="destructive"
>
- Delete
+ Delete
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/components/SecretRow/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/components/SecretRow/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/components/SecretRow/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/components/SecretRow/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/index.ts
similarity index 100%
rename from apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/components/EnvironmentSecrets/components/EnvironmentVariablesList/index.ts
rename to apps/desktop/src/renderer/routes/_authenticated/components/EnvironmentView/components/EnvironmentVariables/components/EnvironmentVariablesList/index.ts
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/MachineSizePickerPill/MachineSizePickerPill.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/MachineSizePickerPill/MachineSizePickerPill.tsx
deleted file mode 100644
index f2e8b7bd6e1..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/MachineSizePickerPill/MachineSizePickerPill.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-import { useLingui } from "@lingui/react/macro";
-import type { MachineSize } from "@superset/shared/billing";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@superset/ui/dropdown-menu";
-import { HiCheck, HiChevronUpDown } from "react-icons/hi2";
-import { LuCpu } from "react-icons/lu";
-import { useMachineSizeOptions } from "renderer/routes/_authenticated/hooks/useMachineSizeOptions";
-import {
- FORM_PICKER_MENU_CLASS,
- FormPickerTrigger,
-} from "../FormPickerTrigger";
-
-interface MachineSizePickerPillProps {
- machineSize: MachineSize | null;
- onSelectMachineSize: (machineSize: MachineSize) => void;
- triggerClassName?: string;
-}
-
-export function MachineSizePickerPill({
- machineSize,
- onSelectMachineSize,
- triggerClassName,
-}: MachineSizePickerPillProps) {
- const { t } = useLingui();
- const { options, defaultSize } = useMachineSizeOptions();
- const selected =
- options.find((option) => option.size === machineSize) ??
- options.find((option) => option.size === defaultSize);
- const label = selected?.name ?? machineSize ?? defaultSize;
-
- return (
-
-
-
-
- {label}
-
-
-
-
- {options.map((option) => (
- onSelectMachineSize(option.size)}
- className="items-start gap-2"
- >
-
-
- {option.name}
-
- {option.spec}
-
-
- {option.size === selected?.size && (
-
- )}
-
- ))}
-
-
- );
-}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/MachineSizePickerPill/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/MachineSizePickerPill/index.ts
deleted file mode 100644
index 2b3c79071c5..00000000000
--- a/apps/desktop/src/renderer/routes/_authenticated/components/MachineSizePickerPill/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MachineSizePickerPill } from "./MachineSizePickerPill";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/SetUpEnvironmentButton/SetUpEnvironmentButton.tsx b/apps/desktop/src/renderer/routes/_authenticated/components/SetUpEnvironmentButton/SetUpEnvironmentButton.tsx
new file mode 100644
index 00000000000..16131079e09
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/SetUpEnvironmentButton/SetUpEnvironmentButton.tsx
@@ -0,0 +1,34 @@
+import { Trans } from "@lingui/react/macro";
+import { cn } from "@superset/ui/utils";
+import { LuContainer, LuLoaderCircle } from "react-icons/lu";
+
+interface SetUpEnvironmentButtonProps {
+ onClick: () => void;
+ pending?: boolean;
+ className?: string;
+}
+
+export function SetUpEnvironmentButton({
+ onClick,
+ pending = false,
+ className,
+}: SetUpEnvironmentButtonProps) {
+ return (
+
+ );
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/components/SetUpEnvironmentButton/index.ts b/apps/desktop/src/renderer/routes/_authenticated/components/SetUpEnvironmentButton/index.ts
new file mode 100644
index 00000000000..756f8847fe6
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/components/SetUpEnvironmentButton/index.ts
@@ -0,0 +1 @@
+export { SetUpEnvironmentButton } from "./SetUpEnvironmentButton";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/hooks/useDefaultCloudAgent/index.ts b/apps/desktop/src/renderer/routes/_authenticated/hooks/useDefaultCloudAgent/index.ts
new file mode 100644
index 00000000000..a216ff36b9b
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/hooks/useDefaultCloudAgent/index.ts
@@ -0,0 +1 @@
+export { useDefaultCloudAgent } from "./useDefaultCloudAgent";
diff --git a/apps/desktop/src/renderer/routes/_authenticated/hooks/useDefaultCloudAgent/useDefaultCloudAgent.ts b/apps/desktop/src/renderer/routes/_authenticated/hooks/useDefaultCloudAgent/useDefaultCloudAgent.ts
new file mode 100644
index 00000000000..40060613bad
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/hooks/useDefaultCloudAgent/useDefaultCloudAgent.ts
@@ -0,0 +1,14 @@
+import { useMemo } from "react";
+import { useCloudAgentChoices } from "renderer/hooks/useCloudAgentChoices";
+import { AGENT_STORAGE_KEY } from "renderer/routes/_authenticated/components/DashboardNewWorkspaceModal/components/DashboardNewWorkspaceForm/PromptGroup/types";
+
+/** The agent a cloud workspace starts with when nobody picked one: the last one chosen on the new-workspace screen, else the first offered. */
+export function useDefaultCloudAgent(): string | null {
+ const agents = useCloudAgentChoices();
+ return useMemo(() => {
+ const saved = window.localStorage.getItem(AGENT_STORAGE_KEY);
+ return (
+ agents.find((agent) => agent.id === saved)?.id ?? agents[0]?.id ?? null
+ );
+ }, [agents]);
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/$environmentId/page.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/environments/$environmentId/page.tsx
new file mode 100644
index 00000000000..93bdaaa4c20
--- /dev/null
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/environments/$environmentId/page.tsx
@@ -0,0 +1,30 @@
+import { Trans } from "@lingui/react/macro";
+import { createFileRoute, useNavigate } from "@tanstack/react-router";
+import { HiArrowLeft } from "react-icons/hi2";
+import { EnvironmentView } from "renderer/routes/_authenticated/components/EnvironmentView";
+
+export const Route = createFileRoute(
+ "/_authenticated/settings/environments/$environmentId/",
+)({
+ component: EnvironmentSettingsPage,
+});
+
+function EnvironmentSettingsPage() {
+ const { environmentId } = Route.useParams();
+ const navigate = useNavigate();
+ const backToList = () => navigate({ to: "/settings/environments" });
+
+ return (
+
+
+
+
+ );
+}
diff --git a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/EnvironmentsSettings.tsx b/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/EnvironmentsSettings.tsx
index d1411a7522a..755b1abb2e4 100644
--- a/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/EnvironmentsSettings.tsx
+++ b/apps/desktop/src/renderer/routes/_authenticated/settings/environments/components/EnvironmentsSettings/EnvironmentsSettings.tsx
@@ -8,7 +8,6 @@ import { useState } from "react";
import {
HiOutlineArchiveBox,
HiOutlineCube,
- HiOutlinePencil,
HiOutlinePlus,
} from "react-icons/hi2";
import { useActiveOrganizationId } from "renderer/hooks/useActiveOrganizationId";
@@ -20,7 +19,6 @@ import {
SETTING_ITEM_ID,
type SettingItemId,
} from "../../../utils/settings-search";
-import { EnvironmentSecrets } from "./components/EnvironmentSecrets";
interface EnvironmentsSettingsProps {
visibleItems?: SettingItemId[] | null;
@@ -34,7 +32,6 @@ export function EnvironmentsSettings({
const utils = cloudTrpc.useUtils();
const navigate = useNavigate();
const [isCreating, setIsCreating] = useState(false);
- const [selectedId, setSelectedId] = useState(null);
const [archiving, setArchiving] = useState<{
id: string;
name: string;
@@ -69,20 +66,10 @@ export function EnvironmentsSettings({
utils.environment.list.invalidate(),
utils.billing.environmentUsage.invalidate(),
]);
- setSelectedId(null);
},
onError: (error) => toast.error(errorMessage(error)),
});
- if (selectedId) {
- return (
- setSelectedId(null)}
- />
- );
- }
-
if (!showList && !showSecrets) return null;
return (
@@ -155,7 +142,12 @@ export function EnvironmentsSettings({
>
-