Fixing ingress (#2999)

dashboard/src/components/repo-selector/ActionConfBranchSelector.tsx

@@ -53,7 +53,7 @@ const ActionConfEditorStack: React.FC<Props> = (props) => {
     <>
       <Input
         disabled={true}
-        label="Specify your branch."
+        label="GitHub branch:"
         type="text"
         width="100%"
         value={props?.branch}

dashboard/src/components/repo-selector/ActionConfEditorStack.tsx

@@ -47,7 +47,7 @@ const ActionConfEditorStack: React.FC<Props> = ({
       <>
         <Input
           disabled={true}
-          label="Specify your Git repository."
+          label="GitHub repository:"
           width="100%"
           value={actionConfig?.git_repo}
           setValue={() => { }}

dashboard/src/main/home/app-dashboard/expanded-app/BuildSettingsTabStack.tsx

@@ -229,7 +229,7 @@ const BuildSettingsTabStack: React.FC<Props> = ({
       <Spacer y={0.5} />
       <Input
         disabled={true}
-        label="Specify your Git repository."
+        label="GitHub repository:"
         width="100%"
         value={actionConfig?.git_repo}
         setValue={() => { }}
@@ -259,7 +259,7 @@ const BuildSettingsTabStack: React.FC<Props> = ({
       {actionConfig.git_repo && branch && (
         <>
           <Spacer y={1} />
-          <Text color="helper">Specify your application root path.</Text>
+          <Text color="helper">Application root path:</Text>
           <Spacer y={0.5} />
           <Input
             disabled={!branch ? true : false}

dashboard/src/main/home/app-dashboard/expanded-app/SharedBuildSettings.tsx

@@ -52,6 +52,8 @@ const SharedBuildSettings: React.FC<Props> = ({
     <>
       <Text size={16}>Build settings</Text>
       <Spacer y={0.5} />
+      <Text color="helper">Specify your GitHub repository.</Text>
+      <Spacer y={0.5} />
       <ActionConfEditorStack
         actionConfig={actionConfig}
         setActionConfig={(actionConfig: ActionConfigType) => {
@@ -70,7 +72,9 @@ const SharedBuildSettings: React.FC<Props> = ({
       <Spacer y={0.3} />
       {actionConfig.git_repo && (
         <>
-          <Spacer y={1} />
+          <Spacer y={0.5} />
+          <Text color="helper">Specify your GitHub branch.</Text>
+          <Spacer y={0.5} />
           <ActionConfBranchSelector
             actionConfig={actionConfig}
             branch={branch}

dashboard/src/main/home/app-dashboard/new-app-flow/WebTabs.tsx

@@ -45,9 +45,9 @@ const WebTabs: React.FC<Props> = ({
         />
         <Spacer y={1} />
         <Checkbox
-          checked={service.generateUrlForExternalTraffic.value}
-          disabled={service.generateUrlForExternalTraffic.readOnly}
-          toggleChecked={() => { editService({ ...service, generateUrlForExternalTraffic: { readOnly: false, value: !service.generateUrlForExternalTraffic.value } }) }}
+          checked={service.ingress.enabled.value}
+          disabled={service.ingress.enabled.readOnly}
+          toggleChecked={() => { editService({ ...service, ingress: { ...service.ingress, enabled: { readOnly: false, value: !service.ingress.enabled.value } } }) }}
           disabledTooltip={"You may only edit this field in your porter.yaml."}
         >
           <Text color="helper">Generate a Porter URL for external traffic</Text>
@@ -149,10 +149,10 @@ const WebTabs: React.FC<Props> = ({
         <Input
           label="Custom domain"
           placeholder="ex: my-app.my-domain.com"
-          value={service.customDomain.value}
-          disabled={service.customDomain.readOnly}
+          value={service.ingress.hosts.value}
+          disabled={service.ingress.hosts.readOnly}
           width="300px"
-          setValue={(e) => { editService({ ...service, customDomain: { readOnly: false, value: e } }) }}
+          setValue={(e) => { editService({ ...service, ingress: { ...service.ingress, hosts: { readOnly: false, value: e } } }) }}
           disabledTooltip={"You may only edit this field in your porter.yaml."}
         />
       </>

dashboard/src/main/home/app-dashboard/new-app-flow/serviceTypes.ts

@@ -105,8 +105,6 @@ const WorkerService = {
 export type WebService = SharedServiceParams & Omit<WorkerService, 'type'> & {
     type: 'web';
     port: ServiceString;
-    generateUrlForExternalTraffic: ServiceBoolean;
-    customDomain: ServiceString;
     ingress: Ingress;
 }
 const WebService = {
@@ -130,8 +128,6 @@ const WebService = {
             porterHosts: ServiceField.string('', porterJson?.apps?.[name]?.config?.ingress?.porter_hosts?.length ? porterJson?.apps?.[name]?.config?.ingress?.porter_hosts[0] : undefined),
         },
         port: ServiceField.string('80', porterJson?.apps?.[name]?.config?.container?.port),
-        generateUrlForExternalTraffic: ServiceField.boolean(false, porterJson?.apps?.[name]?.config?.ingress?.enabled),
-        customDomain: ServiceField.string('', porterJson?.apps?.[name]?.config?.ingress?.hosts?.length ? porterJson?.apps?.[name]?.config?.ingress?.hosts[0] : undefined),
         canDelete: porterJson?.apps?.[name] == null,
     }),
     serialize: (service: WebService) => {
@@ -186,8 +182,6 @@ const WebService = {
                 porterHosts: ServiceField.string(values.ingress?.porter_hosts?.length ? values.ingress.porter_hosts[0] : '', porterJson?.apps?.[name]?.config?.ingress?.porter_hosts?.length ? porterJson?.apps?.[name]?.config?.ingress?.porter_hosts[0] : undefined),
             },
             port: ServiceField.string(values.container?.port ?? '', porterJson?.apps?.[name]?.config?.container?.port),
-            generateUrlForExternalTraffic: ServiceField.boolean(values.ingress?.enabled ?? false, porterJson?.apps?.[name]?.config?.ingress?.enabled),
-            customDomain: ServiceField.string(values.ingress?.hosts?.length ? values.ingress.hosts[0] : '', porterJson?.apps?.[name]?.config?.ingress?.hosts?.length ? porterJson?.apps?.[name]?.config?.ingress?.hosts[0] : undefined),
             canDelete: porterJson?.apps?.[name] == null,
         }
     }