Merge remote-tracking branch 'origin/main' into ft/bitbucket-files-not-found

Author: filiptronicek

components/blobserve/leeway.Dockerfile

@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 
-FROM cgr.dev/chainguard/wolfi-base:latest@sha256:3fb2c86d005ec60f0335ff4b7678480da78014fa9e6432436a9bfd9886f71dea
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:28f57f6a9fb2478f3a3dd160794831bd0099ec92d0d7b81cd203fae67bcb5339
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \

components/content-service/leeway.Dockerfile

@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 
-FROM cgr.dev/chainguard/wolfi-base:latest@sha256:3fb2c86d005ec60f0335ff4b7678480da78014fa9e6432436a9bfd9886f71dea
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:28f57f6a9fb2478f3a3dd160794831bd0099ec92d0d7b81cd203fae67bcb5339
 
 # Ensure latest packages are present, like security updates.
 RUN  apk upgrade --no-cache \

components/dashboard/leeway.Dockerfile

@@ -2,7 +2,7 @@
 # Licensed under the GNU Affero General Public License (AGPL).
 # See License.AGPL.txt in the project root for license information.
 
-FROM cgr.dev/chainguard/wolfi-base:latest@sha256:3fb2c86d005ec60f0335ff4b7678480da78014fa9e6432436a9bfd9886f71dea as compress
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:28f57f6a9fb2478f3a3dd160794831bd0099ec92d0d7b81cd203fae67bcb5339 as compress
 
 RUN apk add brotli gzip
 

components/dashboard/src/AppNotifications.tsx

@@ -20,7 +20,7 @@ import { useOrgBillingMode } from "./data/billing-mode/org-billing-mode-query";
 import { Organization } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
 
 const KEY_APP_DISMISSED_NOTIFICATIONS = "gitpod-app-notifications-dismissed";
-const PRIVACY_POLICY_LAST_UPDATED = "2023-12-20";
+const PRIVACY_POLICY_LAST_UPDATED = "2024-10-01";
 
 interface Notification {
     id: string;

components/dashboard/src/Login.tsx

@@ -37,6 +37,26 @@ export function hasLoggedInBefore() {
     return GitpodCookie.isPresent(document.cookie);
 }
 
+const SEGMENT_SEPARATOR = "/";
+const getContextUrlFromHash = (input: string): URL | undefined => {
+    if (typeof URL.canParse !== "function") {
+        return undefined;
+    }
+    if (URL.canParse(input)) {
+        return new URL(input);
+    }
+
+    const chunks = input.split(SEGMENT_SEPARATOR);
+    for (const chunk of chunks) {
+        input = input.replace(`${chunk}${SEGMENT_SEPARATOR}`, "");
+        if (URL.canParse(input)) {
+            return new URL(input);
+        }
+    }
+
+    return undefined;
+};
+
 type LoginProps = {
     onLoggedIn?: () => void;
 };
@@ -49,10 +69,19 @@ export const Login: FC<LoginProps> = ({ onLoggedIn }) => {
     const enterprise = !!authProviders.data && authProviders.data.length === 0;
 
     useEffect(() => {
-        if (urlHash.length > 0) {
-            const url = new URL(urlHash);
-            setHostFromContext(url.host);
-            setRepoPathname(url.pathname);
+        try {
+            if (urlHash.length > 0) {
+                const url = new URL(urlHash);
+                setHostFromContext(url.host);
+                setRepoPathname(url.pathname);
+            }
+        } catch (error) {
+            // hash is not a valid URL, try to extract the context URL when there are parts like env vars or other prefixes
+            const contextUrl = getContextUrlFromHash(urlHash);
+            if (contextUrl) {
+                setHostFromContext(contextUrl.host);
+                setRepoPathname(contextUrl.pathname);
+            }
         }
     }, [urlHash]);
 

components/dashboard/src/menu/Menu.tsx

@@ -200,7 +200,7 @@ const UserMenu: FC<UserMenuProps> = ({ user, className, withAdminLink, withFeedb
             },
             {
                 title: "Docs",
-                href: "https://www.gitpod.io/docs/",
+                href: "https://www.gitpod.io/docs/introduction",
                 target: "_blank",
                 rel: "noreferrer",
             },

components/dashboard/src/workspaces/Workspaces.tsx

@@ -188,7 +188,7 @@ const WorkspacesPage: FunctionComponent = () => {
                                         <h3 className="text-lg font-semibold text-pk-content-primary">Documentation</h3>
                                         <div className="flex flex-col gap-1 w-fit">
                                             <a
-                                                href="https://www.gitpod.io/docs"
+                                                href="https://www.gitpod.io/docs/introduction"
                                                 target="_blank"
                                                 rel="noopener noreferrer"
                                                 className="text-sm text-pk-content-primary items-center gap-x-2 flex flex-row"

components/ee/agent-smith/leeway.Dockerfile

@@ -4,7 +4,7 @@
 
 
 
-FROM cgr.dev/chainguard/wolfi-base:latest@sha256:3fb2c86d005ec60f0335ff4b7678480da78014fa9e6432436a9bfd9886f71dea
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:28f57f6a9fb2478f3a3dd160794831bd0099ec92d0d7b81cd203fae67bcb5339
 
 RUN apk add --no-cache git bash ca-certificates
 COPY components-ee-agent-smith--app/agent-smith /app/

components/gitpod-cli/cmd/docs.go

@@ -9,7 +9,7 @@ import (
 )
 
 // URL of the Gitpod documentation
-const DocsUrl = "https://www.gitpod.io/docs"
+const DocsUrl = "https://www.gitpod.io/docs/introduction"
 
 var docsCmd = &cobra.Command{
 	Use:   "docs",

components/gitpod-protocol/src/util/parse-workspace-id.spec.ts

@@ -81,5 +81,9 @@ export class ParseWorkspaceIdTest {
         const actual = matchesNewWorkspaceIdExactly("moccasin-ferret-15599b3");
         expect(actual).to.be.false;
     }
+    @test public matchesWorkspaceIdExactly_new_negative_empty() {
+        const actual = matchesNewWorkspaceIdExactly(undefined);
+        expect(actual).to.be.false;
+    }
 }
 module.exports = new ParseWorkspaceIdTest();