Browse Source

Merge pull request #2084 from porter-dev/nico/por-478-user-cant-load-env-group-variables-from

[POR-478] User can't load env group variables from build settings
Nicolas Frati 4 years ago
parent
commit
ae216da2ef
1 changed files with 9 additions and 1 deletions
  1. 9 1
      dashboard/src/main/home/modals/LoadEnvGroupModal.tsx

+ 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])