소스 검색

Merge pull request #830 from porter-dev/0.5.0-procfile-fixes

[0.5.0] [API] Procfile endpoint fixes
abelanger5 4 년 전
부모
커밋
a6ff8f6749
3개의 변경된 파일17개의 추가작업 그리고 8개의 파일을 삭제
  1. 4 0
      dashboard/src/components/repo-selector/ContentsList.tsx
  2. 12 7
      dashboard/src/components/values-form/FormWrapper.tsx
  3. 1 1
      server/api/git_repo_handler.go

+ 4 - 0
dashboard/src/components/repo-selector/ContentsList.tsx

@@ -273,6 +273,10 @@ export default class ContentsList extends Component<PropsType, StateType> {
         );
       }
 
+      if (processes.length == 0) {
+        this.props.setProcfilePath("");
+      }
+
       return (
         <Overlay>
           <BgOverlay

+ 12 - 7
dashboard/src/components/values-form/FormWrapper.tsx

@@ -203,13 +203,15 @@ export default class FormWrapper extends Component<PropsType, StateType> {
       if (this.props.tabOptions?.length > 0) {
         let prependTabs = [] as { value: string; label: string }[];
         let appendTabs = [] as { value: string; label: string }[];
-        this.props.tabOptions.forEach((tab: { value: string; label: string }) => {
-          if (tab.value === "status" || tab.value === "metrics") {
-            prependTabs.push(tab);
-          } else {
-            appendTabs.push(tab);
+        this.props.tabOptions.forEach(
+          (tab: { value: string; label: string }) => {
+            if (tab.value === "status" || tab.value === "metrics") {
+              prependTabs.push(tab);
+            } else {
+              appendTabs.push(tab);
+            }
           }
-        });
+        );
         tabOptions = prependTabs.concat(tabOptions.concat(appendTabs));
       }
       this.setState({ tabOptions }, callback);
@@ -267,7 +269,10 @@ export default class FormWrapper extends Component<PropsType, StateType> {
       !_.isEqual(prevProps.tabOptions, this.props.tabOptions) ||
       !_.isEqual(prevProps.formData, this.props.formData)
     ) {
-      if (prevProps.tabOptions?.length === 0 && !_.isEqual(prevProps.tabOptions, this.props.tabOptions)) {
+      if (
+        prevProps.tabOptions?.length === 0 &&
+        !_.isEqual(prevProps.tabOptions, this.props.tabOptions)
+      ) {
         this.setState({ currentTab: "status" });
       }
       let formHasChanged = !_.isEqual(prevProps.formData, this.props.formData);

+ 1 - 1
server/api/git_repo_handler.go

@@ -354,7 +354,7 @@ func (app *App) HandleGetProcfileContents(w http.ResponseWriter, r *http.Request
 	)
 
 	if err != nil {
-		app.handleErrorInternal(err, w)
+		http.NotFound(w, r)
 		return
 	}