Merge branch 'master' into remove-gpu-from-export

dashboard/src/main/home/app-dashboard/app-view/AppDataContainer.tsx

@@ -525,7 +525,7 @@ const AppDataContainer: React.FC<AppDataContainerProps> = ({ tabParam }) => {
     if ((currentProject?.helm_values_enabled ?? false) || user?.isPorterUser) {
       base.push({ label: "Helm Overrides", value: "helm-overrides" });
     }
-    if (user?.isPorterUser) {
+    if ((currentProject?.helm_values_enabled ?? false) || user?.isPorterUser) {
       base.push({ label: "Latest Helm Values", value: "helm-values" });
     }
 

dashboard/src/main/home/app-dashboard/app-view/tabs/HelmLatestValuesTab.tsx

@@ -1,29 +1,37 @@
-import React from "react";
-import { useLatestRevision } from "../LatestRevisionContext";
-import HelmLatestValues from "../../validate-apply/helm/HelmLatestValues";
-import Text from "components/porter/Text";
+import React, { useContext } from "react";
+
 import Spacer from "components/porter/Spacer";
+import Text from "components/porter/Text";
+
+import { Context } from "shared/Context";
+
+import HelmLatestValues from "../../validate-apply/helm/HelmLatestValues";
+import { useLatestRevision } from "../LatestRevisionContext";
 
 const HelmLatestValuesTab: React.FC = () => {
-    const { projectId, clusterId, latestProto, deploymentTarget, porterApp, latestRevision } = useLatestRevision();
+  const { user } = useContext(Context);
+  const { projectId, clusterId, latestProto, deploymentTarget, porterApp } =
+    useLatestRevision();
 
-    const appName = latestProto.name
+  const appName = latestProto.name;
 
-    return (
-        <>
+  return (
+    <>
+      {user?.isPorterUser && (
         <Text color="helper">
-            This tab is only visible to Porter operators.
+          This tab is only visible to Porter operators.
         </Text>
-        <Spacer y={1} />
-        <HelmLatestValues
-            projectId={projectId}
-            clusterId={clusterId}
-            appName={appName}
-            deploymentTargetId={deploymentTarget.id}
-            appId={porterApp.id}
-        />
-        </>
-    );
+      )}
+      <Spacer y={1} />
+      <HelmLatestValues
+        projectId={projectId}
+        clusterId={clusterId}
+        appName={appName}
+        deploymentTargetId={deploymentTarget.id}
+        appId={porterApp.id}
+      />
+    </>
+  );
 };
 
 export default HelmLatestValuesTab;