From 68ad236e5e5b9301c6a2767e9af8ba101f6a4c49 Mon Sep 17 00:00:00 2001
From: Feroze Mohideen <feroze@porter.run>
Date: Thu, 12 Oct 2023 14:22:16 -0400
Subject: [PATCH] Fix internal URL (#3805)

---
 .../app-dashboard/app-view/tabs/Overview.tsx  |  5 ++-
 .../tabs/activity-feed/ActivityFeed.tsx       |  4 ++-
 .../services-settings/ServiceContainer.tsx    | 15 +++++++--
 .../services-settings/ServiceList.tsx         | 12 +++++--
 .../services-settings/tabs/Networking.tsx     | 31 ++++++++++---------
 .../services-settings/tabs/WebTabs.tsx        | 13 ++++++--
 .../v2/setup-app/AppTemplateForm.tsx          |  5 ++-
 7 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx b/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx
index 646528da3c..073da249bc 100644
--- a/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx
+++ b/dashboard/src/main/home/app-dashboard/app-view/tabs/Overview.tsx
@@ -75,7 +75,10 @@ const Overview: React.FC<Props> = ({ buttonStatus }) => {
         serviceVersionStatus={serviceVersionStatus}
         maxCPU={currentClusterResources.maxCPU}
         maxRAM={currentClusterResources.maxRAM}
-        namespace={deploymentTarget.namespace}
+        internalNetworkingDetails={{
+          namespace: deploymentTarget.namespace,
+          appName: porterApp.name,
+        }}      
       />
       <Spacer y={0.75} />
       <Button
diff --git a/dashboard/src/main/home/app-dashboard/app-view/tabs/activity-feed/ActivityFeed.tsx b/dashboard/src/main/home/app-dashboard/app-view/tabs/activity-feed/ActivityFeed.tsx
index d28fe7561d..2e61a90658 100644
--- a/dashboard/src/main/home/app-dashboard/app-view/tabs/activity-feed/ActivityFeed.tsx
+++ b/dashboard/src/main/home/app-dashboard/app-view/tabs/activity-feed/ActivityFeed.tsx
@@ -178,7 +178,9 @@ const ActivityFeed: React.FC<Props> = ({ appName, deploymentTargetId, currentClu
         );
     }
 
-    if (events != null && events.length === 0) {
+    // if all the events are hidden and there's only one page, show this no-events-found message
+    // else, users should be able to go to the next page for events
+    if (events != null && events.length === 0 && numPages <= 1) { 
         return (
             <Fieldset>
                 <Text size={16}>No events found for "{appName}"</Text>
diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceContainer.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceContainer.tsx
index 8bb035e0dd..1da3caa2b9 100644
--- a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceContainer.tsx
+++ b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceContainer.tsx
@@ -27,7 +27,10 @@ interface ServiceProps {
   status?: PorterAppVersionStatus[];
   maxCPU: number;
   maxRAM: number;
-  namespace: string;
+  internalNetworkingDetails: {
+    namespace: string;
+    appName: string;
+  };
 }
 
 const ServiceContainer: React.FC<ServiceProps> = ({
@@ -38,7 +41,7 @@ const ServiceContainer: React.FC<ServiceProps> = ({
   status,
   maxCPU,
   maxRAM,
-  namespace,
+  internalNetworkingDetails,
 }) => {
   const [height, setHeight] = useState<Height>(service.expanded ? "auto" : 0);
 
@@ -65,7 +68,13 @@ const ServiceContainer: React.FC<ServiceProps> = ({
   const renderTabs = (service: ClientService) => {
     return match(service)
       .with({ config: { type: "web" } }, (svc) => (
-        <WebTabs index={index} service={svc} maxCPU={maxCPU} maxRAM={maxRAM} namespace={namespace} />
+        <WebTabs 
+          index={index} 
+          service={svc} 
+          maxCPU={maxCPU} 
+          maxRAM={maxRAM} 
+          internalNetworkingDetails={internalNetworkingDetails} 
+        />
       ))
       .with({ config: { type: "worker" } }, (svc) => (
         <WorkerTabs
diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceList.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceList.tsx
index 32d0ebf0b1..d8844805e6 100644
--- a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceList.tsx
+++ b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/ServiceList.tsx
@@ -51,7 +51,10 @@ type ServiceListProps = {
   serviceVersionStatus?: Record<string, PorterAppVersionStatus[]>;
   maxCPU: number;
   maxRAM: number;
-  namespace?: string;
+  internalNetworkingDetails?: {
+    namespace: string;
+    appName: string;
+  };
 };
 
 const ServiceList: React.FC<ServiceListProps> = ({
@@ -63,7 +66,10 @@ const ServiceList: React.FC<ServiceListProps> = ({
   serviceVersionStatus,
   maxCPU,
   maxRAM,
-  namespace = "",
+  internalNetworkingDetails = {
+    namespace: "",
+    appName: "",
+  },
 }) => {
   // top level app form
   const { control: appControl } = useFormContext<PorterAppFormData>();
@@ -197,7 +203,7 @@ const ServiceList: React.FC<ServiceListProps> = ({
                 status={serviceVersionStatus?.[svc.name.value]}
                 maxCPU={maxCPU}
                 maxRAM={maxRAM}
-                namespace={namespace}
+                internalNetworkingDetails={internalNetworkingDetails}
               />
             ) : null;
           })}
diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Networking.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Networking.tsx
index 302bd19ce6..a8940262ad 100644
--- a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Networking.tsx
+++ b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/Networking.tsx
@@ -19,10 +19,13 @@ type NetworkingProps = {
       type: "web";
     };
   };
-  namespace: string;
+  internalNetworkingDetails: {
+    namespace: string;
+    appName: string;
+  };
 };
 
-const Networking: React.FC<NetworkingProps> = ({ index, service, namespace }) => {
+const Networking: React.FC<NetworkingProps> = ({ index, service, internalNetworkingDetails: {namespace, appName} }) => {
   const { register, control, watch } = useFormContext<PorterAppFormData>();
 
   const privateService = watch(`app.services.${index}.config.private.value`);
@@ -31,16 +34,16 @@ const Networking: React.FC<NetworkingProps> = ({ index, service, namespace }) =>
 
   const internalURL = useMemo(() => {
     if (port) {
-      return `http://${service.name.value}.${namespace}.svc.cluster.local:${port}`;
+      return `http://${appName}-${service.name.value}.${namespace}.svc.cluster.local:${port}`;
     } 
-    return `http://${service.name.value}.${namespace}.svc.cluster.local`;
+    return `http://${appName}-${service.name.value}.${namespace}.svc.cluster.local`;
   }, [service.name.value, namespace, port]);
 
   const getApplicationURLText = () => {
     if (service.config.domains.length !== 0) {
       return (
         <Text>
-          {`Application URL${service.config.domains.length === 1 ? "" : "s"}: `}
+          {`External URL${service.config.domains.length === 1 ? "" : "s"}: `}
           {service.config.domains.map((d, i) => {
             return (
               <a href={prefixSubdomain(d.name.value)} target="_blank">
@@ -55,7 +58,7 @@ const Networking: React.FC<NetworkingProps> = ({ index, service, namespace }) =>
 
     return (
       <Text color="helper">
-        Application URL: Not generated yet. Porter will generate a URL for you
+        External URL: Not generated yet. Porter will generate a URL for you
         on next deploy.
       </Text>
     );
@@ -74,7 +77,7 @@ const Networking: React.FC<NetworkingProps> = ({ index, service, namespace }) =>
         {...register(`app.services.${index}.port.value`)}
       />
       <Spacer y={0.5} />
-      {namespace && 
+      {namespace && appName &&
         <>
           <Spacer y={0.5} />
           <Text color="helper">
@@ -82,13 +85,13 @@ const Networking: React.FC<NetworkingProps> = ({ index, service, namespace }) =>
           </Text>
           <Spacer y={0.5} />
           <IdContainer>
-                    <Code>{internalURL}</Code>
-                    <CopyContainer>
-                        <CopyToClipboard text={internalURL}>
-                            <CopyIcon src={copy} alt="copy" />
-                        </CopyToClipboard>
-                    </CopyContainer>
-                </IdContainer>
+            <Code>{internalURL}</Code>
+            <CopyContainer>
+                <CopyToClipboard text={internalURL}>
+                    <CopyIcon src={copy} alt="copy" />
+                </CopyToClipboard>
+            </CopyContainer>
+          </IdContainer>
           <Spacer y={0.5} />
         </>
       }
diff --git a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/WebTabs.tsx b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/WebTabs.tsx
index 87a9524cda..fd00419aca 100644
--- a/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/WebTabs.tsx
+++ b/dashboard/src/main/home/app-dashboard/validate-apply/services-settings/tabs/WebTabs.tsx
@@ -19,10 +19,13 @@ interface Props {
   chart?: any;
   maxRAM: number;
   maxCPU: number;
-  namespace: string;
+  internalNetworkingDetails: {
+    namespace: string;
+    appName: string;
+  };
 }
 
-const WebTabs: React.FC<Props> = ({ index, service, maxRAM, maxCPU, namespace }) => {
+const WebTabs: React.FC<Props> = ({ index, service, maxRAM, maxCPU, internalNetworkingDetails }) => {
   const [currentTab, setCurrentTab] = React.useState<
     "main" | "resources" | "networking" | "advanced"
   >("main");
@@ -42,7 +45,11 @@ const WebTabs: React.FC<Props> = ({ index, service, maxRAM, maxCPU, namespace })
       {match(currentTab)
         .with("main", () => <MainTab index={index} service={service} />)
         .with("networking", () => (
-          <Networking index={index} service={service} namespace={namespace} />
+          <Networking 
+            index={index} 
+            service={service} 
+            internalNetworkingDetails={internalNetworkingDetails} 
+          />
         ))
         .with("resources", () => (
           <Resources
diff --git a/dashboard/src/main/home/cluster-dashboard/preview-environments/v2/setup-app/AppTemplateForm.tsx b/dashboard/src/main/home/cluster-dashboard/preview-environments/v2/setup-app/AppTemplateForm.tsx
index 7a48f46a04..37c026925c 100644
--- a/dashboard/src/main/home/cluster-dashboard/preview-environments/v2/setup-app/AppTemplateForm.tsx
+++ b/dashboard/src/main/home/cluster-dashboard/preview-environments/v2/setup-app/AppTemplateForm.tsx
@@ -280,7 +280,10 @@ const AppTemplateForm: React.FC<Props> = ({ existingTemplate }) => {
                 fieldArrayName={"app.services"}
                 maxCPU={currentClusterResources.maxCPU}
                 maxRAM={currentClusterResources.maxRAM}
-                namespace={deploymentTarget.namespace}
+                internalNetworkingDetails={{
+                  namespace: deploymentTarget.namespace,
+                  appName: porterApp.name,
+                }}
               />
             </>,
             <>