Quellcode durchsuchen

temp hide activity feed (#3089)

* redirect from /applications if simplified

* redirect from /applications

* temp hide activity feed

---------

Co-authored-by: Justin Rhee <jusrhee@Justins-MacBook-Air.local>
jusrhee vor 3 Jahren
Ursprung
Commit
3e63ff3d99

+ 3 - 3
dashboard/src/main/home/app-dashboard/expanded-app/ExpandedApp.tsx

@@ -1009,7 +1009,7 @@ const ExpandedApp: React.FC<Props> = ({ ...props }) => {
                     ? hasBuiltImage
                       ? [
                         { label: "Overview", value: "overview" },
-                        { label: "Activity", value: "activity" },
+                        // { label: "Activity", value: "activity" },
                         { label: "Events", value: "events" },
                         { label: "Logs", value: "logs" },
                         { label: "Metrics", value: "metrics" },
@@ -1024,7 +1024,7 @@ const ExpandedApp: React.FC<Props> = ({ ...props }) => {
                       ]
                       : [
                         { label: "Overview", value: "overview" },
-                        { label: "Activity", value: "activity" },
+                        // { label: "Activity", value: "activity" },
                         { label: "Pre-deploy logs", value: "pre-deploy" },
                         {
                           label: "Environment",
@@ -1035,7 +1035,7 @@ const ExpandedApp: React.FC<Props> = ({ ...props }) => {
                       ]
                     : [
                       { label: "Overview", value: "overview" },
-                      { label: "Activity", value: "activity" },
+                      // { label: "Activity", value: "activity" },
                       { label: "Events", value: "events" },
                       { label: "Logs", value: "logs" },
                       { label: "Metrics", value: "metrics" },

+ 2 - 2
dashboard/src/main/home/app-dashboard/expanded-app/activity-feed/events/BuildEventCard.tsx

@@ -35,9 +35,9 @@ const BuildEventCard: React.FC<Props> = ({ event, appData }) => {
   const renderStatusText = (event: PorterAppEvent) => {
     switch (event.status) {
       case "SUCCESS":
-        return <Text color="#68BF8B">Build succeeded.</Text>;
+        return <Text color="#68BF8B">Build succeeded</Text>;
       case "FAILED":
-        return <Text color="#FF6060">Build failed.</Text>;
+        return <Text color="#FF6060">Build failed</Text>;
       default:
         return <Text color="#aaaabb66">Build in progress...</Text>;
     }

+ 7 - 1
dashboard/src/main/home/cluster-dashboard/apps/AppDashboard.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from "react";
+import React, { useContext, useState, useEffect } from "react";
 import styled from "styled-components";
 import { RouteComponentProps, withRouter } from "react-router";
 
@@ -41,6 +41,12 @@ const AppDashboard: React.FC<Props> = ({
   const { currentProject, currentCluster } = useContext(Context);
   const [selectedTag, setSelectedTag] = useState("none");
 
+  useEffect(() => {
+    if (currentProject?.simplified_view_enabled) {
+      window.location.replace("/apps");
+    }
+  }, [currentProject]);
+
   return (
     <StyledAppDashboard>
       <DashboardHeader