more alignments

Author: filiptronicek

src/button/button.tsx

@@ -1,13 +1,13 @@
-import { Storage } from "@plasmohq/storage";
 import { useStorage } from "@plasmohq/storage/hook";
 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 { DEFAULT_GITPOD_ENDPOINT, EVENT_CURRENT_URL_CHANGED } from "~constants";
+import { 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";
+import { isOnaEndpoint } from "~utils/parse-endpoint";
 import type { SupportedApplication } from "./button-contributions";
 import { CaretForProvider } from "./CaretForProvider";
 
@@ -38,18 +38,6 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
         };
     }, []);
 
-    // if the user has no address configured, set it to the default endpoint
-    useEffect(() => {
-        (async () => {
-            // we don't use the useStorage hook because it does not offer a way see if the value is set (it could just be loading), meaning we could end up setting the default endpoint even if it's already set
-            const storage = new Storage();
-            const persistedAddress = await storage.get(STORAGE_KEY_ADDRESS);
-            if (!persistedAddress) {
-                await storage.set(STORAGE_KEY_ADDRESS, DEFAULT_GITPOD_ENDPOINT);
-            }
-        })();
-    }, []);
-
     const actions = useMemo(() => {
         const parsedHref = !urlTransformer ? currentHref : urlTransformer(currentHref);
         return [
@@ -66,6 +54,10 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
     const dropdownRef = useRef<HTMLDivElement | null>(null);
     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 = () => {
         setShowDropdown(!showDropdown);
     };
@@ -89,8 +81,6 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
         }
     }, [showDropdown]);
 
-    const target = openInNewTab ? "_blank" : "_self";
-
     useHotkeys("alt+g", () => linkRef.current?.click(), [linkRef.current]);
 
     return (
@@ -101,7 +91,7 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
         >
             <div className={classNames("button")}>
                 <a
-                    className={classNames("button-part", disableAutostart ? "action-no-options" : "action")}
+                    className={classNames("button-part", effectiveDisableAutostart ? "action-no-options" : "action")}
                     href={actions[0].href}
                     target={target}
                     rel="noreferrer"
@@ -115,7 +105,7 @@ export const GitpodButton = ({ application, additionalClassNames, urlTransformer
                         {actions[0].label}
                     </span>
                 </a>
-                {!disableAutostart && (
+                {!effectiveDisableAutostart && (
                     <button
                         className={classNames("button-part", "action-chevron")}
                         onClick={(e) => {

src/constants.ts

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

src/popup.tsx

@@ -120,7 +120,7 @@ function PopupContent() {
                     </div>
                 </InputField>
                 <CheckboxInputField
-                    label="Open Workspaces in a new tab"
+                    label={`Open ${isOnaEnabled ? "Environments" : "Workspaces"} in a new tab`}
                     checked={openInNewTab}
                     onChange={setOpenInNewTab}
                 />

src/utils/parse-endpoint.ts

@@ -28,3 +28,10 @@ export const hostToOrigin = (host: string): string | undefined => {
 
     return `${origin}/*`;
 };
+
+export const isOnaEndpoint = (url: string): boolean => {
+    const parsedUrl = new URL(url);
+    
+
+    return parsedUrl.hostname === "app.ona.com" || parsedUrl.hostname === "app.gitpod.io";
+};