Merge pull request dcos#2836 from dcos/ahoskins/fix/DCOS-21614-framew…

…ork-edit-ui feat(EditServiceModal): show cosmos services in json-schema form
Fabs · Mar 21, 2018 · 8e01c07 · 8e01c07
2 parents f2935c9 + 8866e50
commit 8e01c07
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/plugins/services/src/js/components/HighOrderServiceConfiguration.js b/plugins/services/src/js/components/HighOrderServiceConfiguration.js
@@ -1,7 +1,6 @@
 import PropTypes from "prop-types";
 import React from "react";
 
-import Framework from "#PLUGINS/services/src/js/structs/Framework";
 import Pod from "../structs/Pod";
 import PodConfigurationContainer
   from "../containers/pod-configuration/PodConfigurationContainer";
@@ -17,7 +16,10 @@ const HighOrderServiceConfiguration = function(props) {
     return <PodConfigurationContainer pod={service} />;
   }
 
-  if (service instanceof Framework) {
+  if (
+    service.getLabels().DCOS_PACKAGE_DEFINITION != null ||
+    service.getLabels().DCOS_PACKAGE_METADATA != null
+  ) {
     return <FrameworkConfigurationContainer service={service} />;
   }
 

diff --git a/plugins/services/src/js/components/modals/EditServiceModal.js b/plugins/services/src/js/components/modals/EditServiceModal.js
@@ -4,7 +4,6 @@ import EditFrameworkConfiguration
   from "#PLUGINS/services/src/js/pages/EditFrameworkConfiguration";
 import CreateServiceModal
   from "#PLUGINS/services/src/js/components/modals/CreateServiceModal";
-import Framework from "#PLUGINS/services/src/js/structs/Framework";
 import DCOSStore from "#SRC/js/stores/DCOSStore";
 
 class EditServiceModal extends Component {
@@ -13,7 +12,10 @@ class EditServiceModal extends Component {
     const serviceID = decodeURIComponent(id);
     const service = DCOSStore.serviceTree.findItemById(serviceID);
 
-    if (service instanceof Framework) {
+    if (
+      service.getLabels().DCOS_PACKAGE_DEFINITION != null ||
+      service.getLabels().DCOS_PACKAGE_METADATA != null
+    ) {
       return <EditFrameworkConfiguration {...this.props} />;
     }