Merge branch 'wktui-567' into 'develop-2.0'

fixing generated names to be singular

See merge request weblogic-cloud/weblogic-toolkit-ui!430

Author: robertpatrick

webui/src/js/utils/modelEdit/instance-helper.js

@@ -16,7 +16,12 @@ function (MessageHelper, AliasHelper, MetaHelper,
 
     // modelPath should end with type name, like /topology/Server
     this.getNewInstanceName = (modelPath, model) => {
-      const typeName = modelPath[modelPath.length - 1];
+      let typeName = MessageHelper.getFolderTypeLabel(modelPath);
+      if (typeName) {
+        typeName = typeName.replace(/ /g, '');
+      } else {
+        typeName = modelPath[modelPath.length - 1];
+      }
       const modelFolder = ModelEditHelper.getFolder(modelPath, model);
       const instanceKeys = Object.keys(modelFolder);
       let i = 1;