change cmaps URLs annotations labels

Author: xabigar

Variants/ConceptAndGo.vdm

@@ -78,7 +78,7 @@
           <cm:constant cm:id="i0nOl3e7KP1TTb9rK" cm:type="ps:string">xabiergarmendia</cm:constant>
         </cm:property>
         <cm:property cm:id="iAs39e5sQ_NxhlFQv" cm:type="ps:datetime" cm:fixed="true" cm:readonly="true" cm:name="ps:Changed">
-          <cm:constant cm:id="iN1wnmEQ6UOvnDBYC" cm:type="ps:datetime">2022-10-03T15:50:22.520Z</cm:constant>
+          <cm:constant cm:id="iN1wnmEQ6UOvnDBYC" cm:type="ps:datetime">2022-10-04T07:27:46.902Z</cm:constant>
         </cm:property>
         <cm:property cm:id="iWJuxDiwLkyeNzFxk" cm:type="ps:string" cm:fixed="true" cm:name="iivhJRwmojkiJvYc5/ikd06TuWH0GM-TRbB">
           <cm:constant cm:id="ioGS5hLGB_iFK8d0Y" cm:type="ps:string">cag</cm:constant>
@@ -90,7 +90,7 @@
           <cm:constant cm:id="iAHOhwmGgkgHYcXfQ" cm:type="ps:string">MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAh62oqu5gL13CQVRafRtqaTWkS6UQru7zvTinTn2UxJvFUjsOttkumdEhKh4g4fOvBdYtT07LNsxgVpehKNRiZqdlwSBVIrNTO2vdDKIIHGd4WGYZ/DJLJ7IMgoIvVgvDozH+WwqMEhaeldI+flDAPPswBClT8Sve3npYpM1pZAd9MPyi8HPUXOyJd83gJY3n156rS+DKIEvlR3Ree1Hs8Jns7oNG0AN4+XNZQ3U4vE3W8+YWBfgIn0GOqKnAtza2WPQ2Pml3wupILypaVP7fIt4yQ++YI9ucvOqYzhaD1l1aFi2OMCOZSXNaixQ4PrRooLqGsWoKuiechYE92dijOQIDAQAB</cm:constant>
         </cm:property>
         <cm:property cm:id="i8UUHEHFFm67mic1-" cm:type="ps:string" cm:fixed="true" cm:name="iivhJRwmojkiJvYc5/iYuM7N7dRcMGZxNk-">
-          <cm:constant cm:id="iA6nS1smmdq3cT4Bi" cm:type="ps:string">1.0.0</cm:constant>
+          <cm:constant cm:id="iA6nS1smmdq3cT4Bi" cm:type="ps:string">0.1.4</cm:constant>
         </cm:property>
         <cm:property cm:id="i7Pb-CBlvD9QufZZ9" cm:type="ps:string" cm:fixed="true" cm:name="iivhJRwmojkiJvYc5/iJML-QuP9BZDq9JNf">
           <cm:constant cm:id="ivjAEkGnwv6I2uTyx" cm:type="ps:string">https://github.com/onekin/WacLine/wiki/User-manual-for-Concept&amp;Go</cm:constant>

WebAnnotator.ccfm

@@ -30617,7 +30617,7 @@
         <cm:mimedesc cm:id="iLWMLXMjecXp9cB5J" cm:mimetype="text/plain" cm:encoding="utf-8">CXLExporter</cm:mimedesc>
       </cm:vname>
     </cm:element>
-    <cm:element cm:id="iUHUdXM1ny1jozKdDeAAu8uZAvua" cm:type="ps:file" cm:class="ps:source" cm:default="on">
+    <cm:element cm:id="iUHUdXM1ny1jozKdDeAAu8uZAvua" cm:type="ps:pvscltext" cm:class="ps:source" cm:default="on">
       <cm:relations cm:id="iUHUdXM1ny1jozKdDeAAu8uZAvuadependecies" cm:class="ps:dependencies">
       </cm:relations>
       <cm:relations cm:id="iPkjszwfHls5UptBglYkIx1Pk8pqKreQAY8DhIiRQ" cm:class="ps:parents">
@@ -30642,7 +30642,7 @@
           <cm:constant cm:id="i6v4Ilns3Vt5eN92w" cm:type="ps:string">xabiergarmendia</cm:constant>
         </cm:property>
         <cm:property cm:id="iuQv-pZsJYgHlt2js" cm:type="ps:datetime" cm:fixed="true" cm:readonly="true" cm:name="ps:Changed">
-          <cm:constant cm:id="i1ts-dRJOuf0I_CwQ" cm:type="ps:datetime">2021-01-26T11:21:35.487Z</cm:constant>
+          <cm:constant cm:id="i1ts-dRJOuf0I_CwQ" cm:type="ps:datetime">2022-10-04T07:18:28.649Z</cm:constant>
         </cm:property>
       </cm:properties>
       <cm:vname>
@@ -30781,7 +30781,7 @@
         <cm:mimedesc cm:id="i7nsDck_b-lmi8Wyj" cm:mimetype="text/plain" cm:encoding="utf-8">ExportCmapCloud</cm:mimedesc>
       </cm:vname>
     </cm:element>
-    <cm:element cm:id="i94ywAyCyOpBzCIN0C7vuHF_qP7k" cm:type="ps:file" cm:class="ps:source" cm:default="on">
+    <cm:element cm:id="i94ywAyCyOpBzCIN0C7vuHF_qP7k" cm:type="ps:pvscltext" cm:class="ps:source" cm:default="on">
       <cm:relations cm:id="i94ywAyCyOpBzCIN0C7vuHF_qP7kdependecies" cm:class="ps:dependencies">
       </cm:relations>
       <cm:relations cm:id="iRkru1919Jyte7owL399_zMqKXCkYR6I46-w1tuJO" cm:class="ps:parents">
@@ -30806,7 +30806,7 @@
           <cm:constant cm:id="iGUeAhVj-dwQL5ElN" cm:type="ps:string">xabiergarmendia</cm:constant>
         </cm:property>
         <cm:property cm:id="iUx_1MITxXACKsHsw" cm:type="ps:datetime" cm:fixed="true" cm:readonly="true" cm:name="ps:Changed">
-          <cm:constant cm:id="iit3K9WzSWITRKjQD" cm:type="ps:datetime">2021-01-26T11:21:35.487Z</cm:constant>
+          <cm:constant cm:id="iit3K9WzSWITRKjQD" cm:type="ps:datetime">2022-10-04T07:18:53.626Z</cm:constant>
         </cm:property>
       </cm:properties>
       <cm:vname>

input/app/scripts/importExport/cmap/CXLExporter.js

@@ -168,10 +168,11 @@ export class CXLExporter {
           let annotation = concept.evidenceAnnotations[i]
           let name
           if (i === 0) {
-            name = LanguageUtils.camelize(concept.theme.name)
+            name = LanguageUtils.camelize(concept.theme.name) + '_source_' + LanguageUtils.camelize(annotation.target[0].source.title)
           } else {
-            name = LanguageUtils.camelize(concept.theme.name + i)
+            name = LanguageUtils.camelize(concept.theme.name + i) + '_source_' + LanguageUtils.camelize(annotation.target[0].source.title)
           }
+          name = name.replace(/[^a-zA-Z0-9 ]/g, '').replace(/\s/g, '')
           let url
           if (evidenceAnnotations === 'hypothesis') {
             url = new HypothesisURL({ elementID, name, annotation })
@@ -212,10 +213,11 @@ export class CXLExporter {
               let fromName = annotation.tags[0].replace('from:', '')
               let toName = annotation.tags[2].replace('to:', '')
               if (i === 0) {
-                name = LanguageUtils.camelize(fromName) + '_To_' + LanguageUtils.camelize(toName)
+                name = LanguageUtils.camelize(fromName) + '_To_' + LanguageUtils.camelize(toName) + '_source_' + LanguageUtils.camelize(annotation.target[0].source.title)
               } else {
-                name = LanguageUtils.camelize(fromName) + '_To_' + LanguageUtils.camelize(toName + i)
+                name = LanguageUtils.camelize(fromName) + '_To_' + LanguageUtils.camelize(toName + i) + '_source_' + LanguageUtils.camelize(annotation.target[0].source.title)
               }
+              name = name.replace(/[^a-zA-Z0-9 ]/g, '').replace(/\s/g, '')
               let url
               if (evidenceAnnotations === 'hypothesis') {
                 url = new HypothesisURL({ elementID, name, annotation })

input/app/scripts/options/Options.js

@@ -92,7 +92,7 @@ class Options {
         if (data.userData.user && data.userData.password && data.userData.uid) {
           document.querySelector('#cmapCloudUserValue').value = data.userData.user
           document.querySelector('#cmapCloudPasswordValue').value = data.userData.password
-          document.querySelector('#uidValue').innerHTML = 'User ID: ' + data.userData.uid
+          document.querySelector('#uidValue').innerHTML = 'You are logged in!'
           $('#cmapCloudUserValue').prop('readonly', true)
           $('#cmapCloudPasswordValue').prop('readonly', true)
           cmapCloudButton.innerHTML = 'Change user credentials'
@@ -346,7 +346,7 @@ class Options {
     }, (response) => {
       if (response.userData) {
         if (response.userData.uid) {
-          document.querySelector('#uidValue').innerHTML = 'User ID: ' + response.userData.uid
+          document.querySelector('#uidValue').innerHTML = 'You are logged in!'
           $('#cmapCloudUserValue').prop('readonly', true)
           $('#cmapCloudPasswordValue').prop('readonly', true)
           document.querySelector('#checkCmapValues').innerHTML = 'Change user credentials'