Ona updates

Author: filiptronicek

README.md

@@ -1,6 +1,6 @@
 # Gitpod Browser extension
 
-[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=gitpod)](https://gitpod.io/#https://github.com/gitpod-io/browser-extension)
+[![Setup Automated](https://img.shields.io/badge/setup-automated-blue?logo=gitpod)](https://app.ona.com/#https://github.com/gitpod-io/browser-extension)
 
 This is the browser extension for Gitpod. It supports Chrome (see [Chrome Web Store](https://chrome.google.com/webstore/detail/dodmmooeoklaejobgleioelladacbeki/)), Firefox (see [Firefox Add-ons](https://addons.mozilla.org/firefox/addon/gitpod/)) and Edge (see [how to install Chrome extensions](https://support.microsoft.com/help/4538971/microsoft-edge-add-or-remove-extensions)), and adds a **Gitpod** button to the configured GitLab, GitHub and Bitbucket installations (defaults to `gitlab.com`, `github.com` and `bitbucket.org`) which immediately creates a Gitpod workspace for the current git context:
 

assets/icon.png

@@ -1,10 +1,10 @@
 {
-    "name": "gitpod",
-    "displayName": "Gitpod",
+    "name": "ona",
+    "displayName": "Ona",
     "version": "2.4.3",
     "description": "The developer platform for on-demand cloud development environments. Create software faster and more securely.",
-    "author": "Gitpod <info@gitpod.io>",
-    "homepage": "https://www.gitpod.io",
+    "author": "Ona <info@ona.com>",
+    "homepage": "https://ona.com",
     "scripts": {
         "dev": "plasmo dev --source-maps --no-minify",
         "watch-dev": "pnpm build-dev-tools && .bin/watch-sync serve ./build/chrome-mv3-dev",
@@ -23,7 +23,7 @@
         "configcat-js": "^9.6.0",
         "configcat-react": "^4.9.0",
         "lucide-react": "^0.474.0",
-        "plasmo": "^0.89.2",
+        "plasmo": "^0.90.5",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-hotkeys-hook": "^4.6.1",

package.json

@@ -10,9 +10,9 @@ import addDomainPermissionToggle from "webext-permission-toggle";
 
 browser.runtime.onInstalled.addListener((details) => {
     if (details.reason === "install") {
-        browser.tabs.create({ url: "https://www.gitpod.io/extension-activation?track=true" });
+        browser.tabs.create({ url: "https://ona.com" });
     }
 });
-browser.runtime.setUninstallURL("https://www.gitpod.io/extension-uninstall?track=true");
+// browser.runtime.setUninstallURL("https://ona.com");
 
 export {};

pnpm-lock.yaml

@@ -3,7 +3,7 @@ import classNames from "classnames";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 import Logo from "react:./logo-mark.svg";
-import { EVENT_CURRENT_URL_CHANGED } from "~constants";
+import { DEFAULT_ONA_ENDPOINT, EVENT_CURRENT_URL_CHANGED } from "~constants";
 import { FeatureFlags, useFlag } from "~hooks/use-configcat";
 import { OnaLettermark } from "~icons/OnaLettermark";
 import { STORAGE_KEY_ADDRESS, STORAGE_KEY_ALWAYS_OPTIONS, STORAGE_KEY_NEW_TAB } from "~storage";
@@ -17,7 +17,7 @@ type Props = {
     urlTransformer?: (url: string) => string;
 };
 export const GitpodButton = ({ application, additionalClassNames, urlTransformer }: Props) => {
-    const [address] = useStorage<string>(STORAGE_KEY_ADDRESS);
+    const [address] = useStorage<string>(STORAGE_KEY_ADDRESS, DEFAULT_ONA_ENDPOINT);
     const [openInNewTab] = useStorage<boolean>(STORAGE_KEY_NEW_TAB, true);
     const [disableAutostart] = useStorage<boolean>(STORAGE_KEY_ALWAYS_OPTIONS, false);
     const [showDropdown, setShowDropdown] = useState(false);
@@ -38,11 +38,15 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
         };
     }, []);
 
+    const isOna = useMemo(() => address && isOnaEndpoint(address), [address]);
     const actions = useMemo(() => {
         const parsedHref = !urlTransformer ? currentHref : urlTransformer(currentHref);
+
+        const autoStartParam = isOna ? "" : "?autostart=true";
+
         return [
             {
-                href: `${address}/?autostart=${!disableAutostart}#${parsedHref}`,
+                href: `${address}/${autoStartParam}#${parsedHref}`,
                 label: "Open",
             },
             {
@@ -55,7 +59,6 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
     const firstActionRef = useRef<HTMLAnchorElement | null>(null);
 
     const target = openInNewTab ? "_blank" : "_self";
-    const isOna = useMemo(() => address && isOnaEndpoint(address), [address]);
     const effectiveDisableAutostart = isOna ? true : disableAutostart;
 
     const toggleDropdown = () => {

src/background.ts

@@ -1,4 +1,3 @@
-export const DEFAULT_GITPOD_ENDPOINT = "https://gitpod.io";
 export const DEFAULT_ONA_ENDPOINT = "https://app.ona.com";
 export const ALL_ORIGINS_WILDCARD = "*://*/*";
 export const EVENT_CURRENT_URL_CHANGED = "current-url-changed";

src/button/button.tsx

@@ -11,7 +11,7 @@ const isSiteGitpod = (): boolean => {
 };
 
 export const config: PlasmoCSConfig = {
-    matches: ["https://gitpod.io/*", "https://app.gitpod.io/*", "https://*.gitpod.cloud/*"],
+    matches: ["https://gitpod.io/*", "https://app.ona.com/*", "https://*.gitpod.cloud/*"],
 };
 
 const storage = new Storage();

src/button/logo-mark.svg

@@ -1,13 +1,13 @@
 import { Storage } from "@plasmohq/storage";
 import { useStorage } from "@plasmohq/storage/hook";
 import { CheckIcon } from "lucide-react";
-import React, { useCallback, useEffect, useState, type FormEvent, type PropsWithChildren } from "react";
+import { useCallback, useEffect, useState, type FormEvent, type PropsWithChildren } from "react";
 import browser from "webextension-polyfill";
 import { Button } from "~components/forms/Button";
 import { CheckboxInputField } from "~components/forms/CheckboxInputField";
 import { InputField } from "~components/forms/InputField";
 import { TextInput } from "~components/forms/TextInputField";
-import { ALL_ORIGINS_WILDCARD, DEFAULT_GITPOD_ENDPOINT, DEFAULT_ONA_ENDPOINT } from "~constants";
+import { ALL_ORIGINS_WILDCARD, DEFAULT_ONA_ENDPOINT } from "~constants";
 import { ConfigCatProvider, configCatProviderConfig, FeatureFlags, useFlag } from "~hooks/use-configcat";
 import { useTemporaryState } from "~hooks/use-temporary-state";
 import {
@@ -34,7 +34,7 @@ const Animate = ({ children, on }: PropsWithChildren<{ on?: string }>) => {
 function PopupContent() {
     const [error, setError] = useState<string>();
 
-    const [storedAddress] = useStorage<string>(STORAGE_KEY_ADDRESS, DEFAULT_GITPOD_ENDPOINT);
+    const [storedAddress] = useStorage<string>(STORAGE_KEY_ADDRESS, DEFAULT_ONA_ENDPOINT);
     const [address, setAddress] = useState<string>(storedAddress);
     const [justSaved, setJustSaved] = useTemporaryState(false, 2000);
 
@@ -102,7 +102,7 @@ function PopupContent() {
             <form className="w-full" onSubmit={updateAddress} action="#">
                 <InputField
                     label={`${isOnaEnabled ? "Ona" : "Gitpod"} URL`}
-                    hint={`${isOnaEnabled ? "Ona" : "Gitpod"} instance URL, e.g., ${isOnaEnabled ? DEFAULT_ONA_ENDPOINT : DEFAULT_GITPOD_ENDPOINT}.`}
+                    hint={`${isOnaEnabled ? "Ona" : "Gitpod"} instance URL, e.g. ${DEFAULT_ONA_ENDPOINT}.`}
                     topMargin={false}
                 >
                     <div className="flex w-full h-10 max-w-sm items-center space-x-2">
@@ -144,8 +144,9 @@ function PopupContent() {
                 <CheckboxInputField
                     label="Always start with options"
                     hint="Changes the primary button to always open with options"
-                    checked={disableAutostart}
+                    checked={isOnaEnabled ? true : disableAutostart}
                     onChange={setDisableAutostart}
+                    disabled={isOnaEnabled}
                 />
                 <CheckboxInputField
                     label="Automatic instance hopping"