Merge pull request #1162 from Microsoft/jwilaby/#936-generic-service

Re-applying lost code changes
microsoft · Dec 10, 2018 · 8bacc53 · 8bacc53
2 parents 2cda763 + 9d0def1
commit 8bacc53
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/...src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/connectedServiceEditor.scss b/...src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/connectedServiceEditor.scss
@@ -11,6 +11,7 @@
     font-weight: 600;
     margin-bottom: 5px;
     padding-left: 8px;
+    width: 100%;
   }
 }
 

diff --git a/.../src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/connectedServiceEditor.tsx b/.../src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/connectedServiceEditor.tsx
@@ -262,8 +262,8 @@ export class ConnectedServiceEditor extends Component<ConnectedServiceEditorProp
 
   private get supplementalContent(): ReactNode {
     if (this.props.serviceType === ServiceTypes.Generic) {
-      const { connectedService = { configuration: {} } } = this.props;
-      const { configuration } = connectedService as IGenericService;
+      const { connectedServiceCopy = { configuration: {} } } = this.state;
+      const { configuration } = connectedServiceCopy as IGenericService;
       return (<KvPair kvPairs={ configuration } onChange={ this.onKvPairChange }/>);
     }
 

diff --git a/packages/app/client/src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/kvPair.tsx b/packages/app/client/src/ui/shell/explorer/servicesExplorer/connectedServiceEditor/kvPair.tsx
@@ -44,20 +44,20 @@ export class KvPair extends Component<KvPairProps, KvPairState> {
     const numEmptyRows = 1 + length - kvPairs.length;
     const rows = [];
 
-    for (let i = 0; i < numEmptyRows; i++) {
-      rows.push(
-        <li key={ kvPairs.length + i }>
-          { this.getTextFieldPair() }
-        </li>);
-    }
-
     kvPairs.forEach((kvPair, index) => {
       rows.push(
         <li key={ index }>
           { this.getTextFieldPair(kvPair.key, kvPair.value) }
         </li>);
     });
 
+    for (let i = 0; i < numEmptyRows; i++) {
+      rows.push(
+        <li key={ kvPairs.length + i }>
+          { this.getTextFieldPair() }
+        </li>);
+    }
+
     return (
       <div>
         <header className={ styles.header }>