@saooti/octopus-sdk 31.0.11 → 31.0.12

package/README.md

@@ -586,3 +586,4 @@ See [Configuration Reference](https://cli.vuejs.org/config/).
  * 31.0.9 LazyLoad image
  * 31.0.10 Sécurisation
  * 31.0.11 Sécurisation
+ * 31.0.12 Commentaires Events

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saooti/octopus-sdk",
-  "version": "31.0.11",
+  "version": "31.0.12",
   "private": false,
   "description": "Javascript SDK for using octopus",
   "author": "Saooti",

package/src/components/display/comments/CommentItem.vue

@@ -267,18 +267,22 @@ export default defineComponent({
       }
       this.$emit('update:comment', updatedComment);
     },
-    receiveCommentEvent(event: {type?: string; comment: CommentPodcast; status?: string; oldStatus?:string }): void {
+    receiveCommentEvent(event: {type: string; comment: CommentPodcast; oldStatus?:string }): void {
       switch (event.type) {
         case 'Create':this.newComment(event.comment, true);break;
         case 'Update':
           if (this.$refs.commentList) {
-            (this.$refs.commentList as InstanceType<typeof CommentList>).updateComment({ comment: event.comment });
+            (this.$refs.commentList as InstanceType<typeof CommentList>).updateComment(event);
           } else {
             const updatedComment = this.comment;
+            let updatedStatus = "";
+            if (event.comment.status && event.comment.status !== event.oldStatus) {
+              updatedStatus = event.comment.status;
+            }
             if(undefined !== updatedComment.relatedValidComments){
-              if ('Invalid' === event.status) {
+              if ('Invalid' ===updatedStatus) {
                 updatedComment.relatedValidComments -= 1;
-              } else if ('Valid' === event.status) {
+              } else if ('Valid' === updatedStatus) {
                 updatedComment.relatedValidComments += 1;
               }
             }

package/src/components/display/comments/CommentList.vue

@@ -179,49 +179,37 @@ export default defineComponent({
       }
       this.comments.splice(index, 1);
     },
-    updateComment(data: {type?: string; comment: CommentPodcast; status?: string; oldStatus?:string }): void {
+    updateComment(data: {type: string; comment: CommentPodcast; oldStatus?:string }): void {
       if (this.commentIsNotInList(data.comment.commentIdReferer)){
         const comItem = (this.$refs['comItem' + data.comment.commentIdReferer] as Array<InstanceType<typeof CommentItem>>)[0];
-        comItem.receiveCommentEvent({ ...data, type: 'Update' });
+        comItem.receiveCommentEvent(data);
         return;
       }
+      const updatedStatus = data.comment.status;
       const index = this.findCommentIndex(data.comment.comId);
       if (-1 !== index) {
-        if ('Valid' !== data.status &&
-          (!this.editRight || (this.status && this.status !== data.status))
-        ) {
+        if ((!this.editRight && 'Valid' !== data.comment.status) ||
+          (this.editRight && this.status && this.status !== data.comment.status)) {
           this.comments.splice(index, 1);
         } else {
           this.comments.splice(index, 1, data.comment);
         }
-      }else if (this.status === data.comment.status) {
-        this.comments.unshift(data.comment);
-      } else if ('Valid' === data.status) {
-        if (this.comments.length > 0) {
-          let indexNewComment = -1;
-          for (let i = 0, len = this.comments.length; i < len; i++) {
-            if (
-              moment(this.comments[i].date).isBefore(moment(data.comment.date))
-            ) {
-              indexNewComment = i;
-              break;
-            }
+      }else if((!this.editRight && 'Valid' === data.comment.status) ||
+              (this.editRight && !this.status) ||
+              (this.editRight && this.status && this.status === data.comment.status)){
+        let indexNewComment = 0;
+        for (let i = 0, len = this.comments.length; i < len; i++) {
+          if (
+            moment(this.comments[i].date).isBefore(moment(data.comment.date))
+          ) {
+            indexNewComment = i;
+            break;
           }
-          if (-1 !== indexNewComment) {
-            if (!this.status || this.status === data.status) {
-              this.comments.splice(indexNewComment, 0, data.comment);
-            } /* else {
-              this.comments.splice(indexNewComment, 1);
-            } */
-          } else if (!this.status || this.status === data.status) {
-            this.comments.push(data.comment);
-          }
-        } else if (!this.status || this.status === data.status) {
-          this.comments.unshift(data.comment);
         }
+        this.comments.splice(indexNewComment, 0, data.comment);
       }
-      if (this.comId && data.status) {
-        this.$emit('updateStatus', data.status);
+      if (this.comId && data.oldStatus!==data.comment.status) {
+        this.$emit('updateStatus', data.comment.status);
       }
     },
     addNewComment(comment: CommentPodcast, myself = false): void {

package/src/components/display/comments/CommentSection.vue

@@ -129,20 +129,11 @@ export default defineComponent({
     newComment(comment: CommentPodcast): void {
       (this.$refs.commentList as InstanceType<typeof CommentListVue>).addNewComment(comment, true);
     },
-    receiveCommentEvent(event: {type?: string; comment: CommentPodcast; status?: string; oldStatus?:string }): void {
+    receiveCommentEvent(event: {type: string; comment: CommentPodcast; oldStatus?:string }): void {
       const commentList = (this.$refs.commentList as InstanceType<typeof CommentListVue>);
-      let statusUpdated = undefined;
       switch (event.type) {
         case 'Create':commentList.addNewComment(event.comment);break;
-        case 'Update':
-          if (event.comment.status !== event.oldStatus) {
-            statusUpdated = event.comment.status;
-          }
-          commentList.updateComment({
-            comment: event.comment,
-            status: statusUpdated,
-          });
-          break;
+        case 'Update':commentList.updateComment(event);break;
         case 'Delete':commentList.deleteComment(event.comment);break;
         default:break;
       }

package/src/components/pages/Podcast.vue

@@ -376,7 +376,7 @@ export default defineComponent({
         this.$router.push('/');
       }
     },
-    receiveCommentEvent(event:{type?: string; comment: CommentPodcast; status?: string; oldStatus?:string } ): void {
+    receiveCommentEvent(event:{type: string; comment: CommentPodcast; oldStatus?:string } ): void {
       (this.$refs.commentSection as InstanceType<typeof CommentSectionVue>).receiveCommentEvent(event);
     },
   },