Skip to content

Commit c9dbe23

Browse files
authored
Remove desktop launch modal from cloud worker flow (anomalyco#877)
Co-authored-by: jcllobet <[email protected]>
1 parent a2795f2 commit c9dbe23

2 files changed

Lines changed: 35 additions & 101 deletions

File tree

‎packages/web/components/cloud-control.tsx‎

Lines changed: 35 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,6 @@ const WORKER_STATUS_POLL_MS = 5000;
184184
const DEFAULT_AUTH_NAME = "OpenWork User";
185185
const OPENWORK_APP_CONNECT_BASE_URL = (process.env.NEXT_PUBLIC_OPENWORK_APP_CONNECT_URL ?? "").trim();
186186
const OPENWORK_AUTH_CALLBACK_BASE_URL = (process.env.NEXT_PUBLIC_OPENWORK_AUTH_CALLBACK_URL ?? "https://app.openwork.software").trim();
187-
const OPENWORK_DOWNLOAD_URL = "https://openwork.software/";
188-
const OPENWORK_DOWNLOAD_FALLBACK_URL = "https://openwork.software/download";
189187
const BILLING_DISABLED_FOR_EXPERIMENT = true;
190188
const STARTUP_ROTATION_MS = 2700;
191189
const STARTUP_SEQUENCE: StartupSequenceItem[] = [
@@ -761,11 +759,24 @@ function getWorkerStatusCopy(status: string): string {
761759
}
762760
}
763761

764-
function getTrafficLightClasses(bucket: WorkerStatusBucket) {
762+
function getStatusIndicatorClasses(bucket: WorkerStatusBucket) {
765763
return {
766-
red: bucket === "attention" || bucket === "other" ? "bg-rose-500 shadow-[0_0_0_4px_rgba(244,63,94,0.16)]" : "bg-rose-100",
767-
amber: bucket === "starting" ? "bg-amber-500 shadow-[0_0_0_4px_rgba(245,158,11,0.16)]" : "bg-amber-100",
768-
green: bucket === "ready" ? "bg-emerald-500 shadow-[0_0_0_4px_rgba(16,185,129,0.16)]" : "bg-emerald-100"
764+
pill:
765+
bucket === "ready"
766+
? "bg-[#E8F5E9] text-[#2E7D32]"
767+
: bucket === "starting"
768+
? "bg-amber-100 text-amber-700"
769+
: bucket === "attention"
770+
? "bg-rose-100 text-rose-700"
771+
: "bg-slate-100 text-slate-500",
772+
dot:
773+
bucket === "ready"
774+
? "bg-[#2E7D32]"
775+
: bucket === "starting"
776+
? "bg-amber-500"
777+
: bucket === "attention"
778+
? "bg-rose-500"
779+
: "bg-slate-400"
769780
};
770781
}
771782

@@ -1329,9 +1340,6 @@ export function CloudControlPanel() {
13291340
const [runtimeBusy, setRuntimeBusy] = useState(false);
13301341
const [runtimeError, setRuntimeError] = useState<string | null>(null);
13311342
const [runtimeUpgradeBusy, setRuntimeUpgradeBusy] = useState(false);
1332-
const [dismissedDesktopPromptWorkerId, setDismissedDesktopPromptWorkerId] = useState<string | null>(null);
1333-
const [isDesktopViewport, setIsDesktopViewport] = useState(false);
1334-
13351343
const selectedWorker = workers.find((item) => item.workerId === workerLookupId) ?? null;
13361344
const activeWorker: WorkerLaunch | null =
13371345
worker && workerLookupId === worker.workerId
@@ -1449,20 +1457,13 @@ export function CloudControlPanel() {
14491457

14501458
const selectedWorkerStatus = activeWorker?.status ?? selectedWorker?.status ?? "unknown";
14511459
const selectedStatusMeta = getWorkerStatusMeta(selectedWorkerStatus);
1452-
const trafficLights = getTrafficLightClasses(selectedStatusMeta.bucket);
1460+
const selectedStatusIndicator = getStatusIndicatorClasses(selectedStatusMeta.bucket);
14531461
const primaryWorker = activeWorker;
1454-
const primaryAppUrl = openworkDeepLink;
1462+
const primaryAppUrl = openworkDeepLink ?? openworkAppConnectUrl;
14551463
const browserStartUrl = openworkAppConnectUrl;
1456-
const canOpenWorker = selectedStatusMeta.bucket === "ready" && Boolean(primaryAppUrl);
1457-
const canStartInOpenwork = selectedStatusMeta.bucket === "ready" && Boolean(openworkDeepLink);
1458-
const canStartHere = selectedStatusMeta.bucket === "ready" && Boolean(browserStartUrl);
1464+
const canStartWorker = selectedStatusMeta.bucket === "ready" && Boolean(primaryAppUrl ?? browserStartUrl);
14591465
const showStartupSequence = launchBusy || (Boolean(primaryWorker) && selectedStatusMeta.bucket !== "ready");
1460-
const showDesktopStartupModal =
1461-
isDesktopViewport &&
1462-
Boolean(primaryWorker) &&
1463-
selectedStatusMeta.bucket !== "ready" &&
1464-
dismissedDesktopPromptWorkerId !== primaryWorker?.workerId;
1465-
const showInlineStartupSequence = showStartupSequence && !showDesktopStartupModal;
1466+
const showInlineStartupSequence = showStartupSequence;
14661467
const effectiveCheckoutUrl = BILLING_DISABLED_FOR_EXPERIMENT ? null : (checkoutUrl ?? billingSummary?.checkoutUrl ?? null);
14671468
const billingSubscription = billingSummary?.subscription ?? null;
14681469
const billingPrice = billingSummary?.price ?? null;
@@ -1485,37 +1486,6 @@ export function CloudControlPanel() {
14851486
});
14861487
}
14871488

1488-
useEffect(() => {
1489-
if (typeof window === "undefined") {
1490-
return;
1491-
}
1492-
1493-
const mediaQuery = window.matchMedia("(min-width: 1024px)");
1494-
const handleChange = () => setIsDesktopViewport(mediaQuery.matches);
1495-
1496-
handleChange();
1497-
mediaQuery.addEventListener("change", handleChange);
1498-
return () => mediaQuery.removeEventListener("change", handleChange);
1499-
}, []);
1500-
1501-
useEffect(() => {
1502-
if (!primaryWorker || selectedStatusMeta.bucket === "ready") {
1503-
setDismissedDesktopPromptWorkerId(null);
1504-
}
1505-
}, [primaryWorker?.workerId, selectedStatusMeta.bucket]);
1506-
1507-
useEffect(() => {
1508-
if (!showDesktopStartupModal || !primaryWorker) {
1509-
return;
1510-
}
1511-
1512-
const timeout = window.setTimeout(() => {
1513-
setDismissedDesktopPromptWorkerId(primaryWorker.workerId);
1514-
}, 90_000);
1515-
1516-
return () => window.clearTimeout(timeout);
1517-
}, [primaryWorker, showDesktopStartupModal]);
1518-
15191489
async function withResolvedOpenworkCredentials(candidate: WorkerLaunch, options: { quiet?: boolean } = {}) {
15201490
const existingConnectUrl = candidate.openworkUrl?.trim() ?? "";
15211491
const existingWorkspaceId = candidate.workspaceId?.trim() ?? "";
@@ -2912,10 +2882,10 @@ export function CloudControlPanel() {
29122882

29132883
{primaryWorker ? (
29142884
<div className="rounded-[20px] border border-slate-200 bg-slate-50 p-3">
2915-
<div className="flex items-center gap-2">
2916-
<span className={`h-3 w-3 rounded-full ${trafficLights.red}`} />
2917-
<span className={`h-3 w-3 rounded-full ${trafficLights.amber}`} />
2918-
<span className={`h-3 w-3 rounded-full ${trafficLights.green}`} />
2885+
<div className={`inline-flex items-center gap-2 rounded-full px-3 py-2 text-[11px] font-semibold uppercase tracking-[0.14em] ${selectedStatusIndicator.pill}`}>
2886+
<span className={`h-2 w-2 rounded-full ${selectedStatusIndicator.dot}`} />
2887+
<span>Status</span>
2888+
<span>{getSimplifiedStatusTitle(selectedStatusMeta.bucket)}</span>
29192889
</div>
29202890
</div>
29212891
) : null}
@@ -2929,72 +2899,34 @@ export function CloudControlPanel() {
29292899
onClick={handleLaunchWorker}
29302900
disabled={!user || launchBusy}
29312901
>
2932-
{launchBusy ? "Starting worker..." : "Start worker"}
2902+
{launchBusy ? "Starting the worker..." : "Start the worker"}
29332903
</button>
29342904
) : (
29352905
<>
2936-
{canOpenWorker && primaryAppUrl ? (
2906+
{canStartWorker && (primaryAppUrl ?? browserStartUrl) ? (
29372907
<a
2938-
href={primaryAppUrl}
2908+
href={primaryAppUrl ?? browserStartUrl ?? "#"}
29392909
target="_blank"
29402910
rel="noreferrer"
2941-
className="block w-full rounded-[18px] bg-[#1B29FF] px-4 py-3 text-center text-base font-semibold text-white shadow-[0_14px_30px_rgba(27,41,255,0.22)] transition hover:bg-[#151FDA] lg:hidden"
2911+
className="block w-full rounded-[18px] bg-[#1B29FF] px-4 py-3 text-center text-base font-semibold text-white shadow-[0_14px_30px_rgba(27,41,255,0.22)] transition hover:bg-[#151FDA]"
29422912
>
2943-
Open in app
2913+
Start the worker
29442914
</a>
29452915
) : (
29462916
<button
29472917
type="button"
29482918
disabled
2949-
className="w-full rounded-[18px] bg-slate-200 px-4 py-3 text-base font-semibold text-slate-500 lg:hidden"
2919+
className="w-full rounded-[18px] bg-slate-200 px-4 py-3 text-base font-semibold text-slate-500"
29502920
>
2951-
Open in app
2921+
Start the worker
29522922
</button>
29532923
)}
2954-
2955-
<div className="hidden gap-3 lg:grid">
2956-
{canStartInOpenwork && openworkDeepLink ? (
2957-
<a
2958-
href={openworkDeepLink}
2959-
className="block w-full rounded-[18px] bg-[#1B29FF] px-4 py-3 text-center text-base font-semibold text-white shadow-[0_14px_30px_rgba(27,41,255,0.22)] transition hover:bg-[#151FDA]"
2960-
>
2961-
Start in OpenWork
2962-
</a>
2963-
) : (
2964-
<button
2965-
type="button"
2966-
disabled
2967-
className="w-full rounded-[18px] bg-slate-200 px-4 py-3 text-base font-semibold text-slate-500"
2968-
>
2969-
Start in OpenWork
2970-
</button>
2971-
)}
2972-
2973-
{canStartHere && browserStartUrl ? (
2974-
<a
2975-
href={browserStartUrl}
2976-
target="_blank"
2977-
rel="noreferrer"
2978-
className="block w-full rounded-[18px] border border-slate-300 bg-white px-4 py-3 text-center text-base font-semibold text-slate-700 transition hover:border-slate-400 hover:text-slate-900"
2979-
>
2980-
Start here
2981-
</a>
2982-
) : (
2983-
<button
2984-
type="button"
2985-
disabled
2986-
className="w-full rounded-[18px] border border-slate-200 bg-slate-100 px-4 py-3 text-base font-semibold text-slate-400"
2987-
>
2988-
Start here
2989-
</button>
2990-
)}
2991-
</div>
29922924
</>
29932925
)}
29942926

29952927
<p className="text-xs leading-5 text-slate-500">
29962928
{primaryWorker
2997-
? canOpenWorker
2929+
? canStartWorker
29982930
? "The start button unlocks as soon as the worker is ready."
29992931
: "The start button unlocks automatically when the worker is ready."
30002932
: "Founder Ops is the default name. Change it before launch if you want to."}
@@ -3094,6 +3026,7 @@ export function CloudControlPanel() {
30943026
</div>
30953027
) : null}
30963028

3029+
{/* Preserved for later recovery: desktop download modal.
30973030
{showDesktopStartupModal ? (
30983031
<div
30993032
className="fixed inset-0 z-50 hidden items-center justify-center bg-slate-950/10 p-5 backdrop-blur-[2px] lg:flex"
@@ -3186,6 +3119,7 @@ export function CloudControlPanel() {
31863119
</div>
31873120
</div>
31883121
) : null}
3122+
*/}
31893123

31903124
</div>
31913125
</section>
345 KB
Loading

0 commit comments

Comments
 (0)