minor refactor from pr comment and fix crashing for loading old resou…

…rce without imagebuilderconfig
caraml-dev · Dec 8, 2023 · ed13ac9 · ed13ac9
1 parent 2d1e720
commit ed13ac9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/api/cmd/api/main.go b/api/cmd/api/main.go
@@ -173,9 +173,9 @@ func main() {
 
 		ModelDeletionEnabled: cfg.FeatureToggleConfig.ModelDeletionConfig.Enabled,
 
-		ImageBuilderCluster:   cfg.ImageBuilderConfig.ClusterName,
-		ImageBuilderProject:   cfg.ImageBuilderConfig.GcpProject,
-		ImageBuilderNamespace: cfg.ImageBuilderConfig.BuildNamespace,
+		ImageBuilderCluster:   	cfg.ImageBuilderConfig.ClusterName,
+		ImageBuilderGCPProject:	cfg.ImageBuilderConfig.GcpProject,
+		ImageBuilderNamespace: 	cfg.ImageBuilderConfig.BuildNamespace,
 	}
 
 	uiHomePage := fmt.Sprintf("/%s", strings.TrimPrefix(cfg.ReactAppConfig.HomePage, "/"))

diff --git a/api/cmd/api/ui_handler.go b/api/cmd/api/ui_handler.go
@@ -23,9 +23,9 @@ type uiEnvHandler struct {
 
 	ModelDeletionEnabled bool `json:"REACT_APP_MODEL_DELETION_ENABLED"`
 
-	ImageBuilderCluster   string `json:"REACT_APP_IMAGE_BUILDER_CLUSTER"`
-	ImageBuilderProject   string `json:"REACT_APP_IMAGE_BUILDER_PROJECT"`
-	ImageBuilderNamespace string `json:"REACT_APP_IMAGE_BUILDER_NAMESPACE"`
+	ImageBuilderCluster   	string `json:"REACT_APP_IMAGE_BUILDER_CLUSTER"`
+	ImageBuilderGCPProject	string `json:"REACT_APP_IMAGE_BUILDER_GCP_PROJECT"`
+	ImageBuilderNamespace 	string `json:"REACT_APP_IMAGE_BUILDER_NAMESPACE"`
 }
 
 func (h uiEnvHandler) handler(w http.ResponseWriter, r *http.Request) {

diff --git a/ui/src/components/logs/ContainerLogsView.js b/ui/src/components/logs/ContainerLogsView.js
@@ -200,9 +200,9 @@ export const ContainerLogsView = ({
           titleProps={{ style: { width: "30%", fontSize: '14px'} }}
           type="column" 
           >
-          <EuiDescriptionListTitle style={{ width: "30%", fontSize: '14px'}} >Imagebuider URL</EuiDescriptionListTitle>
+          <EuiDescriptionListTitle style={{ width: "30%", fontSize: '14px'}} >Stackdriver Logs</EuiDescriptionListTitle>
           <EuiDescriptionListDescription>
-            <EuiLink href={imagebuilderStackdriverUrl} target="_blank" external>Stackdriver Logs</EuiLink>
+            <EuiLink href={imagebuilderStackdriverUrl} target="_blank" external>Image Builder</EuiLink>
           </EuiDescriptionListDescription>
           </EuiDescriptionList>
         </EuiCard>
@@ -255,7 +255,7 @@ export const ContainerLogsView = ({
           </EuiFlexGroup>
         ) : (
           <EuiEmptyPrompt
-            title={<h2>You have no logs</h2>}
+            title={<h2>Active Container Logs</h2>}
             body={
               <Fragment>
                 <p>

diff --git a/ui/src/config.js b/ui/src/config.js
@@ -62,7 +62,7 @@ export const appConfig = {
   },
   imagebuilder:{
     cluster:  getEnv("REACT_APP_IMAGE_BUILDER_CLUSTER"),
-    gcp_project: getEnv("REACT_APP_IMAGE_BUILDER_PROJECT"),
+    gcp_project: getEnv("REACT_APP_IMAGE_BUILDER_GCP_PROJECT"),
     namespace: getEnv("REACT_APP_IMAGE_BUILDER_NAMESPACE"),
   }
 };

diff --git a/ui/src/pages/version/components/forms/components/ImageBuilderSection.js b/ui/src/pages/version/components/forms/components/ImageBuilderSection.js
@@ -37,7 +37,7 @@ export const ImageBuilderSection = ({
         >
             <EuiFieldText
             placeholder="500m"
-            value={imageBuilderResourceConfig.cpu_request}
+            value={imageBuilderResourceConfig?.cpu_request}
             onChange={(e) => onChange("cpu_request")(e.target.value)}
             isInvalid={!!errors.cpu_request}
             name="cpu"
@@ -59,7 +59,7 @@ export const ImageBuilderSection = ({
         >
             <EuiFieldText
             placeholder="500Mi"
-            value={imageBuilderResourceConfig.memory_request}
+            value={imageBuilderResourceConfig?.memory_request}
             onChange={(e) => onChange("memory_request")(e.target.value)}
             isInvalid={!!errors.memory_request}
             name="memory"