Merge pull request dcos#2677 from dcos/lily/DCOS_OSS-2086-update-conf…

…ig-headings Lily/dcos oss 2086 update config headings
Fabs · Jan 31, 2018 · ed276a9 · ed276a9
2 parents 1e7c29a + 6be6a83
commit ed276a9
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 145 deletions.
diff --git a/plugins/services/src/js/service-configuration/PodGeneralConfigSection.js b/plugins/services/src/js/service-configuration/PodGeneralConfigSection.js
@@ -108,7 +108,7 @@ const PodGeneralConfigSection = ({ appConfig, onEditClick }) => {
 
   return (
     <div>
-      <ConfigurationMapHeading level={1}>General</ConfigurationMapHeading>
+      <ConfigurationMapHeading level={1}>Service</ConfigurationMapHeading>
       <ConfigurationMapSection key="pod-general-section">
         <MountService.Mount
           type="CreateService:ServiceConfigDisplay:Pod:General"

diff --git a/plugins/services/src/js/service-configuration/PodNetworkConfigSection.js b/plugins/services/src/js/service-configuration/PodNetworkConfigSection.js
@@ -105,7 +105,7 @@ class PodNetworkConfigSection extends React.Component {
 
     return (
       <div>
-        <ConfigurationMapHeading level={1}>Network</ConfigurationMapHeading>
+        <ConfigurationMapHeading level={1}>Networking</ConfigurationMapHeading>
         <ConfigurationMapSection key="pod-general-section">
           <MountService.Mount
             type="CreateService:ServiceConfigDisplay:Pod:Network"

diff --git a/plugins/services/src/js/service-configuration/PodStorageConfigSection.js b/plugins/services/src/js/service-configuration/PodStorageConfigSection.js
@@ -116,7 +116,7 @@ class PodStorageConfigSection extends React.Component {
 
     return (
       <div>
-        <ConfigurationMapHeading level={1}>Storage</ConfigurationMapHeading>
+        <ConfigurationMapHeading level={1}>Volumes</ConfigurationMapHeading>
         <ConfigurationMapSection key="pod-general-section">
           <MountService.Mount
             type="CreateService:ServiceConfigDisplay:Pod:Storage"

diff --git a/plugins/services/src/js/service-configuration/ServiceConfigDisplay.js b/plugins/services/src/js/service-configuration/ServiceConfigDisplay.js
@@ -38,9 +38,9 @@ const DEFAULT_DISPLAY_COMPONENTS = [
       ServicePlacementConstraintsConfigSection,
       ServiceNetworkingConfigSection,
       ServiceStorageConfigSection,
+      ServiceHealthChecksConfigSection,
       ServiceEnvironmentVariablesConfigSection,
-      ServiceLabelsConfigSection,
-      ServiceHealthChecksConfigSection
+      ServiceLabelsConfigSection
     ]
   },
   {
@@ -51,9 +51,9 @@ const DEFAULT_DISPLAY_COMPONENTS = [
       PodPlacementConstraintsConfigSection,
       PodNetworkConfigSection,
       PodStorageConfigSection,
+      PodHealthChecksConfigSection,
       PodEnvironmentVariablesConfigSection,
-      PodLabelsConfigSection,
-      PodHealthChecksConfigSection
+      PodLabelsConfigSection
     ]
   }
 ];

diff --git a/plugins/services/src/js/service-configuration/ServiceGeneralConfigSection.js b/plugins/services/src/js/service-configuration/ServiceGeneralConfigSection.js
@@ -72,7 +72,7 @@ class ServiceGeneralConfigSection extends ServiceConfigBaseSectionDisplay {
       tabViewID: "services",
       values: [
         {
-          heading: "General",
+          heading: "Service",
           headingLevel: 1
         },
         {

diff --git a/plugins/services/src/js/service-configuration/ServiceLabelsConfigSection.js b/plugins/services/src/js/service-configuration/ServiceLabelsConfigSection.js
@@ -40,7 +40,7 @@ class ServiceLabelsConfigSection extends ServiceConfigBaseSectionDisplay {
           render(labelsDataMap) {
             const columns = [
               {
-                heading: ServiceConfigDisplayUtil.getColumnHeadingFn(),
+                heading: ServiceConfigDisplayUtil.getColumnHeadingFn("Key"),
                 prop: "key",
                 render: (prop, row) => {
                   return <code>{row[prop]}</code>;
@@ -51,7 +51,7 @@ class ServiceLabelsConfigSection extends ServiceConfigBaseSectionDisplay {
                 sortable: true
               },
               {
-                heading: ServiceConfigDisplayUtil.getColumnHeadingFn(),
+                heading: ServiceConfigDisplayUtil.getColumnHeadingFn("Value"),
                 prop: "value",
                 className: ServiceConfigDisplayUtil.getColumnClassNameFn(
                   "configuration-map-table-value"

diff --git a/plugins/services/src/js/service-configuration/ServiceNetworkingConfigSection.js b/plugins/services/src/js/service-configuration/ServiceNetworkingConfigSection.js
@@ -47,7 +47,7 @@ class ServiceNetworkingConfigSection extends ServiceConfigBaseSectionDisplay {
       tabViewID: "networking",
       values: [
         {
-          heading: "Network",
+          heading: "Networking",
           headingLevel: 1
         },
         {

diff --git a/plugins/services/src/js/service-configuration/ServiceStorageConfigSection.js b/plugins/services/src/js/service-configuration/ServiceStorageConfigSection.js
@@ -42,7 +42,7 @@ class ServiceStorageConfigSection extends ServiceConfigBaseSectionDisplay {
       values: [
         {
           key: "container.volumes",
-          heading: "Storage",
+          heading: "Volumes",
           headingLevel: 1
         },
         {

diff --git a/tests/pages/services/ServiceExternalVolumes-cy.js b/tests/pages/services/ServiceExternalVolumes-cy.js
@@ -100,54 +100,54 @@ describe("Services", function() {
       // Verify the review screen
       cy
         .root()
-        .configurationSection("General")
+        .configurationSection("Service")
         .configurationMapValue("Service ID")
         .contains(`/${serviceName}`);
       cy
         .root()
-        .configurationSection("General")
+        .configurationSection("Service")
         .configurationMapValue("Container Runtime")
         .contains("Universal Container Runtime (UCR)");
       cy
         .root()
-        .configurationSection("General")
+        .configurationSection("Service")
         .configurationMapValue("CPU")
         .contains("0.1");
       cy
         .root()
-        .configurationSection("General")
+        .configurationSection("Service")
         .configurationMapValue("Memory")
         .contains("64 MiB");
       cy
         .root()
-        .configurationSection("General")
+        .configurationSection("Service")
         .configurationMapValue("Disk")
         .contains("Not Configured");
 
       cy
         .root()
-        .configurationSection("Storage")
+        .configurationSection("Volumes")
         .children("table")
         .getTableColumn("Volume")
         .contents()
         .should("deep.equal", [`External (${volumeName})`]);
       cy
         .root()
-        .configurationSection("Storage")
+        .configurationSection("Volumes")
         .children("table")
         .getTableColumn("Size")
         .contents()
         .should("deep.equal", ["1 GiB"]);
       cy
         .root()
-        .configurationSection("Storage")
+        .configurationSection("Volumes")
         .children("table")
         .getTableColumn("Mode")
         .contents()
         .should("deep.equal", ["RW"]);
       cy
         .root()
-        .configurationSection("Storage")
+        .configurationSection("Volumes")
         .children("table")
         .getTableColumn("Container Mount Path")
         .contents()

diff --git a/tests/pages/services/ServiceFormModal-cy.js b/tests/pages/services/ServiceFormModal-cy.js
@@ -1468,10 +1468,10 @@ describe("Service Form Modal", function() {
           expect($h1).to.have.length(2);
 
           // First should be General
-          expect($h1.eq(0)).to.contain("General");
+          expect($h1.eq(0)).to.contain("Service");
 
           // Second should be Network
-          expect($h1.eq(1)).to.contain("Network");
+          expect($h1.eq(1)).to.contain("Networking");
         });
       });