fix: count and display 'class changed' proposals

zazuko · Dec 16, 2019 · af832ce · af832ce
1 parent 8e96954
commit af832ce
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/components/fallback/PropertyProposals.vue b/components/fallback/PropertyProposals.vue
@@ -164,7 +164,7 @@ export default {
       return !!_get(this.changedPropertyProposals, 'proposals.length')
     },
     hasProposals () {
-      return this.hasObjectProposal || this.hasClassProposal || this.hasPropertyProposal
+      return this.hasObjectProposals || this.hasClassProposals || this.hasPropertyProposals
     }
   },
   apollo: {

diff --git a/store/class.js b/store/class.js
@@ -80,7 +80,7 @@ export const actions = {
       const isEdit = state.clss.isEdit
 
       const mutation = gql`
-        mutation (${mutationParam}$headline: String!, $body: String!, $iri: String!, $proposalObject: JSON!, $threadType: ThreadType!, $isEdit: Boolean!) {
+        mutation (${mutationParam}$headline: String!, $body: String!, $iri: String!, $proposalObject: JSON!, $threadType: ThreadType!, $isEdit: Boolean!, $originalIRI: String) {
           upsertThread (input: {
             thread: {
               ${threadInput}
@@ -89,7 +89,8 @@ export const actions = {
               iri: $iri,
               proposalObject: $proposalObject,
               threadType: $threadType,
-              isEdit: $isEdit
+              isEdit: $isEdit,
+              originalIri: $originalIRI
             }
           }) {
             thread {
@@ -111,6 +112,9 @@ export const actions = {
       if (threadId) {
         variables.id = threadId
       }
+      if (state.clss.originalIRI) {
+        variables.originalIRI = state.clss.originalIRI
+      }
       const result = await this.app.apolloProvider.defaultClient.mutate({
         mutation,
         variables

diff --git a/store/graph.js b/store/graph.js
@@ -112,12 +112,13 @@ export const actions = {
       const result = await this.app.apolloProvider.defaultClient.query({
         query: countProposals
       })
+
       const proposals = _get(result, 'data.proposals.proposals', [])
       const count = proposals.reduce((acc, { iri, originalIri, isEdit, proposalObject }) => {
         const proposalType = proposalObject[proposalObject[0].proposalType]
 
         if (proposalType === 'Class' && isEdit) {
-          iri = originalIri
+          iri = iri || originalIri
         }
         if (!acc[iri]) {
           acc[iri] = {
@@ -146,6 +147,7 @@ export const actions = {
         }
         return acc
       }, {})
+
       commit('proposalCountByIRI', count)
     }
     catch (err) {