Merge branch 'main' into hw/fix-tests

gitpod-io · Mar 19, 2024 · d92d4b9 · d92d4b9
2 parents 95b809f + 3f20297
commit d92d4b9
Show file tree

Hide file tree

Showing 116 changed files with 2,050 additions and 1,680 deletions.
diff --git a/WORKSPACE.yaml b/WORKSPACE.yaml
@@ -7,17 +7,17 @@ defaultArgs:
  publishToNPM: true
  publishToJBMarketplace: true
  localAppVersion: unknown
- codeCommit: 65bcfaa1136f4ea1111c9ba4277c194478004e43
- codeVersion: 1.87.0
+ codeCommit: 0ab7db2c7269dc6711fee21bb9a4c2cc7c08142d
+ codeVersion: 1.87.1
  codeQuality: stable
  noVerifyJBPlugin: false
- intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2023.3.4.tar.gz"
- golandDownloadUrl: "https://download.jetbrains.com/go/goland-2023.3.4.tar.gz"
+ intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2023.3.5.tar.gz"
+ golandDownloadUrl: "https://download.jetbrains.com/go/goland-2023.3.5.tar.gz"
  pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2023.3.4.tar.gz"
- phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2023.3.4.tar.gz"
- rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2023.3.4.tar.gz"
- webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2023.3.4.tar.gz"
- riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.3.tar.gz"
+ phpstormDownloadUrl: "https://download.jetbrains.com/webide/PhpStorm-2023.3.5.tar.gz"
+ rubymineDownloadUrl: "https://download.jetbrains.com/ruby/RubyMine-2023.3.5.tar.gz"
+ webstormDownloadUrl: "https://download.jetbrains.com/webstorm/WebStorm-2023.3.5.tar.gz"
+ riderDownloadUrl: "https://download.jetbrains.com/rider/JetBrains.Rider-2023.3.4.tar.gz"
  clionDownloadUrl: "https://download.jetbrains.com/cpp/CLion-2023.3.4.tar.gz"
  jbBackendVersion: "latest"
  dockerVersion: "20.10.24"

diff --git a/components/blobserve/leeway.Dockerfile b/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:3d6dece13cdb5546cd03b20e14f9af354bc1a56ab5a7b47dca3e6c1557211fcf
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:9496b3fe80bcd98cf2af63b8cd904fce45554c6632093de0f5adf51a08c07d49
 
 # Ensure latest packages are present, like security updates.
 RUN apk upgrade --no-cache \

diff --git a/components/content-service/leeway.Dockerfile b/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:3d6dece13cdb5546cd03b20e14f9af354bc1a56ab5a7b47dca3e6c1557211fcf
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:9496b3fe80bcd98cf2af63b8cd904fce45554c6632093de0f5adf51a08c07d49
 
 # Ensure latest packages are present, like security updates.
 RUN apk upgrade --no-cache \

diff --git a/components/dashboard/leeway.Dockerfile b/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:3d6dece13cdb5546cd03b20e14f9af354bc1a56ab5a7b47dca3e6c1557211fcf as compress
+FROM cgr.dev/chainguard/wolfi-base:latest@sha256:9496b3fe80bcd98cf2af63b8cd904fce45554c6632093de0f5adf51a08c07d49 as compress
 
 RUN apk add brotli gzip
 

diff --git a/components/dashboard/src/Login.tsx b/components/dashboard/src/Login.tsx
@@ -9,9 +9,6 @@ import { useContext, useEffect, useState, useMemo, useCallback, FC } from "react
 import { UserContext } from "./user-context";
 import { getGitpodService } from "./service/service";
 import { iconForAuthProvider, openAuthorizeWindow, simplifyProviderName } from "./provider-utils";
-import gitpod from "./images/gitpod.svg";
-import gitpodDark from "./images/gitpod-dark.svg";
-import gitpodIcon from "./icons/gitpod.svg";
 import exclamation from "./images/exclamation.svg";
 import { getURLHash } from "./utils";
 import ErrorMessage from "./components/ErrorMessage";
@@ -24,6 +21,8 @@ import { AuthProviderDescription } from "@gitpod/public-api/lib/gitpod/v1/authpr
 import { Button, ButtonProps } from "@podkit/buttons/Button";
 import { cn } from "@podkit/lib/cn";
 import { userClient } from "./service/public-api";
+import { ProductLogo } from "./components/ProductLogo";
+import { useIsDataOps } from "./data/featureflag-query";
 
 export function markLoggedIn() {
  document.cookie = GitpodCookie.generateCookie(window.location.hostname);
@@ -38,6 +37,7 @@ type LoginProps = {
 };
 export const Login: FC<LoginProps> = ({ onLoggedIn }) => {
  const { setUser } = useContext(UserContext);
+ const isDataOps = useIsDataOps();
 
  const urlHash = useMemo(() => getURLHash(), []);
 
@@ -133,20 +133,13 @@ export const Login: FC<LoginProps> = ({ onLoggedIn }) => {
  <div className="flex-grow h-100 flex flex-row items-center justify-center">
  <div className="rounded-xl px-10 py-10 mx-auto">
  <div className="mx-auto pb-8">
- <img
- src={providerFromContext ? gitpod : gitpodIcon}
- className="h-14 mx-auto block dark:hidden"
- alt="Gitpod's logo"
- />
- <img
- src={providerFromContext ? gitpodDark : gitpodIcon}
- className="h-14 hidden mx-auto dark:block"
- alt="Gitpod dark theme logo"
- />
+ <ProductLogo className="h-14 mx-auto block" />
  </div>
 
  <div className="mx-auto text-center pb-8 space-y-2">
- {providerFromContext ? (
+ {isDataOps ? (
+ <Heading1>Log in to DataOps.live Develop</Heading1>
+ ) : providerFromContext ? (
  <>
  <Heading2>Open a cloud development environment</Heading2>
  <Subheading>for the repository {repoPathname?.slice(1)}</Subheading>