Merge branch 'main' into update-digests

WORKSPACE.yaml

@@ -7,8 +7,8 @@ defaultArgs:
   publishToNPM: true
   publishToJBMarketplace: true
   localAppVersion: unknown
-  codeCommit: b889dadbf401a55d02e2fb98981d9c7832f07ea2
-  codeVersion: 1.96.3
+  codeCommit: e81ab749002377cf40b1551661a6b80725141ff0
+  codeVersion: 1.97.2
   codeQuality: stable
   codeWebExtensionCommit: 3953e8160fffa97dd4a4509542b4bf7ff9b704cd
   xtermCommit: d547d4ff4590b66c3ea24342fc62e3afcf6b77bc

components/dashboard/src/insights/download/DownloadInsights.tsx

@@ -82,7 +82,7 @@ export const DownloadInsightsToast = ({ organizationId, from, to, organizationNa
         <div className="flex flex-row items-start justify-between space-x-2">
             <div>
                 <span>Insights export complete.</span>
-                <p className="dark:text-gray-500">
+                <p className="text-pk-content-invert-primary/90">
                     {readableSize} &middot; {formattedCount} {data.count !== 1 ? "entries" : "entry"} exported
                 </p>
             </div>

components/dashboard/src/usage/download/DownloadUsage.tsx

@@ -124,7 +124,7 @@ const DownloadUsageToast: FC<DownloadUsageToastProps> = ({ attributionId, endDat
         <div className="flex flex-row items-start justify-between space-x-2">
             <div>
                 <span>Usage export complete.</span>
-                <p className="dark:text-gray-500">
+                <p className="text-pk-content-invert-primary/90">
                     {readableSize} &middot; {formattedCount} {data.count !== 1 ? "entries" : "entry"} exported
                 </p>
             </div>

components/ide-proxy/Dockerfile

@@ -14,7 +14,7 @@ RUN for FILE in `ls /bin/gitpod-local-companion*`;do \
   done
 
 RUN mkdir -p static/code
-RUN curl -o static/code/marketplace.json "https://raw.githubusercontent.com/open-vsx/publish-extensions/e5c7f0ac781b430049c9f07fed10ee5c388b0097/extension-control/extensions.json"
+RUN curl -o static/code/marketplace.json "https://raw.githubusercontent.com/EclipseFdn/publish-extensions/d9a7cc2d486ca881e9df310324f9752f48156283/extension-control/extensions.json"
 
 FROM caddy/caddy:2.7.6-alpine
 

components/ws-daemon/pkg/controller/workspace_controller.go

@@ -226,7 +226,7 @@ func (wsc *WorkspaceController) handleWorkspaceInit(ctx context.Context, ws *wor
 }
 
 func initializerMetricsFromInitializerStats(stats *csapi.InitializerMetrics) *workspacev1.InitializerMetrics {
-	if stats == nil {
+	if stats == nil || len(*stats) == 0 {
 		return nil
 	}