From ad319bffb02e10b1767e19471b0d5516fca53775 Mon Sep 17 00:00:00 2001
From: khansadaoudi <hk_daoudi@esi.dz>
Date: Tue, 24 Sep 2024 16:21:23 +0200
Subject: [PATCH] count annotation schema changes for github commits

---
 src/api/backend-api.ts                         |  2 +-
 src/components/project/CreaProjectCard.vue     |  4 ++--
 src/components/project/ProjectSettingsView.vue | 16 +++++++++++++---
 src/pages/Project.vue                          |  2 +-
 src/pinia/modules/project/index.ts             |  3 ++-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/api/backend-api.ts b/src/api/backend-api.ts
index 3e98d7e0..aa5f62e0 100644
--- a/src/api/backend-api.ts
+++ b/src/api/backend-api.ts
@@ -98,7 +98,7 @@ export default {
   getProjectConlluSchema(projectName: string) {
     return API.get<getProjectConlluSchema_RV>(`projects/${projectName}/conll-schema`);
   },
-  updateProjectConlluSchema(projectName: string, data: updateProjectConlluSchema_ED) {
+  updateProjectConlluSchema(projectName: string, data: any) {
     return API.put(`projects/${projectName}/conll-schema`, data);
   },
   getProjectUsersAccess(projectName: string) {
diff --git a/src/components/project/CreaProjectCard.vue b/src/components/project/CreaProjectCard.vue
index 5ae0a1bf..ad2b71c1 100644
--- a/src/components/project/CreaProjectCard.vue
+++ b/src/components/project/CreaProjectCard.vue
@@ -251,9 +251,9 @@ export default defineComponent({
           this.parentGetProjects();
           this.submitting = false;
           if (this.project.config === 'ud') {
-            this.updateProjectConlluSchema(this.project.projectName, this.annotationFeaturesUD);
+            this.updateProjectConlluSchema(this.project.projectName, this.annotationFeaturesUD, false);
           } else {
-            this.updateProjectConlluSchema(this.project.projectName, this.annotationFeaturesSUD);
+            this.updateProjectConlluSchema(this.project.projectName, this.annotationFeaturesSUD, false);
           }
           if (this.loggedWithGithub && !this.project.blindAnnotationMode) {
             this.progress = 0.4;
diff --git a/src/components/project/ProjectSettingsView.vue b/src/components/project/ProjectSettingsView.vue
index 1d17a894..5aa5e53d 100644
--- a/src/components/project/ProjectSettingsView.vue
+++ b/src/components/project/ProjectSettingsView.vue
@@ -234,7 +234,7 @@
 <script lang="ts">
 import JsonEditorVue from 'json-editor-vue';
 import { mapActions, mapState, mapWritableState } from 'pinia';
-import { sample_t } from 'src/api/backend-types';
+import { sample_t, annotationFeatures_t } from 'src/api/backend-types';
 import { useProjectStore } from 'src/pinia/modules/project';
 import { notifyError, notifyMessage } from 'src/utils/notify';
 import { PropType, defineComponent } from 'vue';
@@ -276,7 +276,8 @@ export default defineComponent({
         mode: 'text',
         tabSize: 4,
         indentation: 4,
-      }
+      },
+      currentFeatures: {} as annotationFeatures_t,
     };
   },
   computed: {
@@ -380,6 +381,7 @@ export default defineComponent({
   },
   mounted() {
     this.annotationFeaturesJson = JSON.stringify(this.annotationFeatures, null, 4);
+    this.currentFeatures = this.annotationFeatures;
   },
   watch: {
     annotationFeaturesJson(newValue) {
@@ -407,13 +409,21 @@ export default defineComponent({
       }
     },
     saveAnnotationSettings() {
-      this.updateProjectConlluSchema(this.projectName, JSON.parse(this.annotationFeaturesJson))
+      const parsedAnnotFeatures = JSON.parse(this.annotationFeaturesJson);
+      const featsChanged = JSON.stringify(parsedAnnotFeatures.FEATS) !== JSON.stringify(this.currentFeatures.FEATS);
+      const miscChanged = JSON.stringify(parsedAnnotFeatures.MISC) !== JSON.stringify(this.currentFeatures.MISC);
+
+      const updateCommits = featsChanged || miscChanged // if the feats or misc changed the data in grew will be modified in this case we need to count it as change to commit
+      
+      this.updateProjectConlluSchema(this.projectName, parsedAnnotFeatures, updateCommits)
         .then(() => {
           notifyMessage({ message: 'New annotation settings saved on the server', icon: 'save' });
         })
         .catch((error) => {
           notifyError({ error });
         });
+        
+      this.$emit('reload');
     },
 
     resetAnnotationFeaturesWrapper() {
diff --git a/src/pages/Project.vue b/src/pages/Project.vue
index 79d2f7db..68b47f83 100644
--- a/src/pages/Project.vue
+++ b/src/pages/Project.vue
@@ -122,7 +122,7 @@
         </q-card>
       </q-dialog>
       <q-dialog v-model="projectSettingsDial">
-        <ProjectSettingsView :projectName="projectName" :samples="samples" />
+        <ProjectSettingsView :projectName="projectName" :samples="samples" @reload="loadProjectData()" />
       </q-dialog>
       <UploadDialog v-model:uploadDial="uploadDial" :samples="samples" @uploaded:sample="loadProjectData()" />
     </div>
diff --git a/src/pinia/modules/project/index.ts b/src/pinia/modules/project/index.ts
index 3d651270..8e2202bf 100644
--- a/src/pinia/modules/project/index.ts
+++ b/src/pinia/modules/project/index.ts
@@ -218,11 +218,12 @@ export const useProjectStore = defineStore('project', {
           });
       });
     },
-    updateProjectConlluSchema(projectName: string, annotationFeatures: annotationFeatures_t) {
+    updateProjectConlluSchema(projectName: string, annotationFeatures: annotationFeatures_t, updateCommit: boolean) {
       return new Promise((resolve, reject) => {
         api
           .updateProjectConlluSchema(projectName, {
             config: annotationFeatures,
+            updateCommit: updateCommit
           })
           .then((response) => {
             this.annotationFeatures = annotationFeatures;