Tweaks #337

app/javascript/vue/components/autocomplete.vue

@@ -264,7 +264,6 @@ export default {
           else {
             params += `&${key}=${this.addParams[key]}`
           }
-          console.log(params)
         })
       }
       return tempUrl + params

app/javascript/vue/tasks/digitize/app.vue

@@ -27,8 +27,9 @@
   import TaxonDeterminationLayout from './components/taxonDetermination/main.vue'
   import CollectionEventLayout from './components/collectionEvent/main.vue'
   import TypeMaterial from './components/typeMaterial/typeMaterial.vue'
-  import { GetUserPreferences } from './request/resources.js'
+  import { GetUserPreferences, GetIdentifier } from './request/resources.js'
   import { MutationNames } from './store/mutations/mutations.js'
+  import { ActionNames } from './store/actions/actions.js'
   import { GetterNames } from './store/getters/getters.js'
   import SpinnerComponent from 'components/spinner.vue'
   import ContainerItems from './components/collectionObject/containerItems.vue'
@@ -50,9 +51,17 @@
       }
     },
     mounted() {
+      let identifierId = location.pathname.split('/')[4]
+
       GetUserPreferences().then(response => {
         this.$store.commit(MutationNames.SetPreferences, response)
       })
+
+      if (/^\d+$/.test(identifierId)) {
+        this.$store.dispatch(ActionNames.GetIdentifier, identifierId).then(response => {
+          this.$store.dispatch(ActionNames.LoadDigitalization, response.identifier_object_id)
+        })
+      }
     },
     methods: {
       getMacKey() {

app/javascript/vue/tasks/digitize/components/catalogueNumber/catalogNumber.vue

@@ -11,7 +11,8 @@
             class="separate-right"
             url="/namespaces/autocomplete"
             min="2"
-            @getItem="namespace = $event.id"
+            @getItem="namespace = $event.id; namespaceSelected = $event.label"
+            :display="namespaceSelected"
             label="label_html"
             ref="autocomplete"
             param="term"/>
@@ -88,9 +89,6 @@
           this.$store.commit(MutationNames.SetSettings, value)
         }        
       },
-      collectionObjects() {
-        return this.$store.getters[GetterNames.GetCollectionObjects]
-      },
       namespace: {
         get() {
           return this.$store.getters[GetterNames.GetIdentifier].namespace_id
@@ -117,6 +115,14 @@
       },
       checkValidation() {
         return !validateIdentifier({ namespace_id: this.namespace, identifier: this.identifier })
+      },
+      namespaceSelected: {
+        get() {
+          return this.$store.getters[GetterNames.GetNamespaceSelected]
+        },
+        set(value) {
+          this.$store.commit(MutationNames.SetNamespaceSelected, value)
+        }
       }
     },
     data() {
@@ -131,6 +137,9 @@
         if(!newVal) {
           this.$refs.autocomplete.cleanInput()
         }
+      },
+      namespaceSelected(newVal) {
+        this.$refs.autocomplete.setLabel(newVal)
       }
     },
     methods: {

app/javascript/vue/tasks/digitize/components/taskHeader/main.vue

@@ -88,6 +88,7 @@
       },
       loadAssessionCode(object) {
         this.$store.dispatch(ActionNames.LoadDigitalization, object.identifier_object_id)
+        this.$store.dispatch(ActionNames.GetIdentifier, object.id)
       }
     }
   }

app/javascript/vue/tasks/digitize/request/resources.js

@@ -181,6 +181,14 @@ const GetRepository = function (id) {
   return ajaxCall('get', `/repositories/${id}.json`)
 }
 
+const GetIdentifier = function (id) {
+  return ajaxCall('get', `/identifiers/${id}.json`)
+}
+
+const GetNamespace = function (id) {
+  return ajaxCall('get', `/namespaces/${id}.json`)
+}
+
 const CreateTypeMaterial = function (data) {
   return ajaxCall('post', `/type_materials.json`, { type_material: data })
 }
@@ -243,6 +251,8 @@ export {
   GetTypeDesignatorSmartSelector,
   FilterCollectingEvent,
   GetTaxonDeterminationCO,
+  GetNamespace,
+  GetIdentifier,
   GetTypeMaterialCO,
   GetTypes,
   GetTaxon,

app/javascript/vue/tasks/digitize/store/actions/actionNames.js

@@ -1,5 +1,6 @@
 const ActionNames = {
   GetTaxon: 'getTaxon',
+  GetIdentifier: 'getIdentifier',
   GetCollectionObject: 'getCollectionObject',
   GetCollectionEvent: 'getCollectionEvent',
   GetTypeMaterial: 'getTypeMaterial',

app/javascript/vue/tasks/digitize/store/actions/actions.js

@@ -6,6 +6,7 @@ import getTypeMaterial from './getTypeMaterial'
 import getTaxonDeterminations from './getTaxonDeterminations'
 import getCollectionObject from './getCollectionObject'
 import getCollectionEvent from './getCollectionEvent'
+import getIdentifier from './getIdentifier'
 import saveDigitalization from './saveDigitalization'
 import saveIdentifier from './saveIdentifier'
 import saveCollectionObject from './saveCollectionObject'
@@ -31,6 +32,7 @@ const ActionFunctions = {
   [ActionNames.AddToContainer]: addToContainer,
   [ActionNames.LoadDigitalization]: loadDigitalization,
   [ActionNames.GetTaxon]: getTaxon,
+  [ActionNames.GetIdentifier]: getIdentifier,
   [ActionNames.GetTypeMaterial]: getTypeMaterial,
   [ActionNames.GetCollectionObject]: getCollectionObject,
   [ActionNames.GetCollectionEvent]: getCollectionEvent,

app/javascript/vue/tasks/digitize/store/actions/getIdentifier.js

@@ -0,0 +1,14 @@
+import { GetIdentifier, GetNamespace } from '../../request/resources'
+import { MutationNames } from '../mutations/mutations'
+
+export default function ({ commit }, id) {
+  return new Promise((resolve, reject) => {
+    GetIdentifier(id).then(response => {
+      commit(MutationNames.SetIdentifier, response)
+      GetNamespace(response.namespace_id).then(namespace => {
+        commit(MutationNames.SetNamespaceSelected, namespace.name)
+        return resolve(response)
+      })
+    })
+  })
+}

app/javascript/vue/tasks/digitize/store/actions/loadDigitalization.js

@@ -6,7 +6,6 @@ export default function ({ commit, dispatch, state }, coId) {
     dispatch(ActionNames.GetCollectionObject, coId).then((coObject) => {
       if(coObject.collecting_event_id)
         dispatch(ActionNames.GetCollectionEvent, coObject.collecting_event_id)
-      //dispatch(ActionNames.GetIdentifiers)
       dispatch(ActionNames.GetTypeMaterial, coId)
       dispatch(ActionNames.GetTaxonDeterminations, coId)
       commit(MutationNames.AddCollectionObject, coObject)

app/javascript/vue/tasks/digitize/store/getters/getNamespaceSelected.js

@@ -0,0 +1,3 @@
+export default function(state) {
+  return state.namespaceSelected
+}

app/javascript/vue/tasks/digitize/store/getters/getters.js

@@ -18,6 +18,7 @@ import getPreparationType from './getPreparationType'
 import getMaterialTypes from './getMaterialTypes'
 import getLabel from './getLabel'
 import getTaxonDeterminations from './getTaxonDeterminations'
+import getNamespaceSelected from './getNamespaceSelected'
 
 const GetterNames = {
   IsSaving: 'isSaving',
@@ -39,7 +40,8 @@ const GetterNames = {
   GetPreparationType: 'getPreparationType',
   GetMaterialTypes: 'getMaterialTypes',
   GetLabel: 'GetLabel',
-  GetTaxonDeterminations: 'GetTaxonDeterminations'
+  GetTaxonDeterminations: 'GetTaxonDeterminations',
+  GetNamespaceSelected: 'getNamespaceSelected'
 }
 
 const GetterFunctions = {
@@ -62,7 +64,8 @@ const GetterFunctions = {
   [GetterNames.GetPreparationType]: getPreparationType,
   [GetterNames.GetMaterialTypes]: getMaterialTypes,
   [GetterNames.GetLabel]: getLabel,
-  [GetterNames.GetTaxonDeterminations]: getTaxonDeterminations
+  [GetterNames.GetTaxonDeterminations]: getTaxonDeterminations,
+  [GetterNames.GetNamespaceSelected]: getNamespaceSelected
 }
 
 export {

app/javascript/vue/tasks/digitize/store/mutations/mutations.js

@@ -11,6 +11,8 @@ import resetStore from './resetStore'
 
 import setDepictions from './setDepictions'
 
+import setNamespaceSelected from './setNamespaceSelected'
+
 import setBiocurations from './setBiocurations'
 import addBiocuration from './addBiocuration'
 import removeBiocuration from './removeBiocuration'
@@ -117,6 +119,7 @@ const MutationNames = {
   ResetStore: 'resetStore',
 
   SetDepictions: 'setDepictions',
+  SetNamespaceSelected: 'setNamespaceSelected',
 
   SetLabel: 'setLabel',
   SetLabelText: 'setLabelText',
@@ -227,6 +230,7 @@ const MutationFunctions = {
   [MutationNames.ResetStore]: resetStore,
 
   [MutationNames.SetDepictions]: setDepictions,
+  [MutationNames.SetNamespaceSelected]: setNamespaceSelected,
 
   [MutationNames.SetBiocurations]: setBiocurations,
   [MutationNames.AddBiocuration]: addBiocuration,

app/javascript/vue/tasks/digitize/store/mutations/setNamespaceSelected.js

@@ -0,0 +1,3 @@
+export default function(state, value) {
+  state.namespaceSelected = value
+}

app/javascript/vue/tasks/digitize/store/store.js

@@ -135,7 +135,8 @@ function makeInitialState () {
     COTypes: [],
     biocurations: [],
     preparation_type_id: undefined,
-    taxon_determinations: []
+    taxon_determinations: [],
+    namespaceSelected: ''
   }
 }
 

config/routes.rb

@@ -819,7 +819,7 @@
 
     scope :accessions do
       scope :comprehensive, controller: 'tasks/accessions/comprehensive' do
-        get 'index', as: 'comprehensive_collection_object_task'
+        get '(:id)', action: :index, as: 'comprehensive_collection_object_task'
       end
 
       scope :report do