Quellcode durchsuchen

Merge pull request #2085 from porter-dev/master

load env group modal fix + portforward CLI -> staging
Nicolas Frati vor 4 Jahren
Ursprung
Commit
549aee4383

+ 3 - 0
.github/workflows/prerelease.yaml

@@ -540,6 +540,9 @@ jobs:
           sed -i 's/uses: porter-dev\/porter-update-action.*/uses: porter-dev\/porter-update-action@${{ steps.tag_name.outputs.tag }}/g' porter_test_docker_production.yml
           sed -i 's/uses: porter-dev\/porter-cli-action.*/uses: porter-dev\/porter-cli-action@${{ steps.tag_name.outputs.tag }}/g' porter_test_docker_production.yml
 
+          sed -i 's/uses: porter-dev\/porter-update-action.*/uses: porter-dev\/porter-update-action@${{ steps.tag_name.outputs.tag }}/g' test_porter_cli.yml
+          sed -i 's/uses: porter-dev\/porter-cli-action.*/uses: porter-dev\/porter-cli-action@${{ steps.tag_name.outputs.tag }}/g' test_porter_cli.yml
+
           cd ../..
 
           git config user.name "Update Bot"

+ 1 - 1
cli/cmd/portforward.go

@@ -140,7 +140,7 @@ func portForward(user *types.GetAuthenticatedUserResponse, client *api.Client, a
 			return err
 		}
 
-		pod = pods[podIdx]
+		pod = pods[podIdx-1]
 	} else {
 		pod = pods[0]
 	}

+ 9 - 1
dashboard/src/main/home/modals/LoadEnvGroupModal.tsx

@@ -20,7 +20,7 @@ import {
 } from "components/porter-form/types";
 import Helper from "components/form-components/Helper";
 import DocsHelper from "components/DocsHelper";
-import { isObject } from "lodash";
+import { isEmpty, isObject } from "lodash";
 
 type PropsType = {
   namespace: string;
@@ -161,6 +161,14 @@ export default class LoadEnvGroupModal extends Component<PropsType, StateType> {
     if (!incoming) {
       return [];
     }
+
+    if (
+      !isObject(this.props.existingValues) ||
+      isEmpty(this.props.existingValues)
+    ) {
+      return [];
+    }
+
     // console.log(incoming, this.props.existingValues);
     return Object.entries(incoming)
       .filter(([key]) => this.props.existingValues[key])