[convert-contact-forms] fix re-ordering if -create/-edit suffix not p…

…resent Closes #57
medic · Feb 6, 2018 · 8dc4e22 · 8dc4e22
1 parent d0ae4c3
commit 8dc4e22
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medic-conf",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "description": "Configure Medic Mobile deployments",
   "main": "index.js",
   "scripts": {

diff --git a/src/fn/convert-contact-forms.js b/src/fn/convert-contact-forms.js
@@ -21,7 +21,7 @@ module.exports = (projectDir, couchUrl, extras) => {
       force_data_node: 'data',
       forms: extras,
       transformer: (xml, path) => {
-        const type = path.replace(/.*\/(.*)-(create|edit)\.xml/, '$1');
+        const type = path.replace(/.*\/(.*?)(-(create|edit))?\.xml/, '$1');
 
         if(PLACE_TYPES) {
           xml = xml

diff --git a/test/data/convert-contact-forms/forms/contact/district_hospital.expected.xml b/test/data/convert-contact-forms/forms/contact/district_hospital.expected.xml
@@ -21,14 +21,14 @@
               <district_name/>
             </contact>
           </inputs>
+          <district_hospital>
+            <name/>
+          </district_hospital>
           <contact>
             <debug_note/>
             <name/>
           </contact>
           <contact_notes/>
-          <district_hospital>
-            <name/>
-          </district_hospital>
           <meta>
             <instanceID/>
           </meta>