@aj-shadow/z-abs-complayer-visualizationsequencediagram-client 0.0.0-aj-beta.221 → 0.0.0-aj-beta.224

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@aj-shadow/z-abs-complayer-visualizationsequencediagram-client",
-  "version": "0.0.0-aj-beta.221",
+  "version": "0.0.0-aj-beta.224",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@aj-shadow/z-abs-complayer-visualizationsequencediagram-client",
-      "version": "0.0.0-aj-beta.221",
+      "version": "0.0.0-aj-beta.224",
       "license": "SEE LICENSE IN LICENSE.txt"
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aj-shadow/z-abs-complayer-visualizationsequencediagram-client",
-  "version": "0.0.0-aj-beta.221",
+  "version": "0.0.0-aj-beta.224",
   "release-step": "delivery",
   "description": "Library used by @actorjs/actorjs",
   "author": "ActorJs",

package/project/client/logic/const.js

@@ -38,20 +38,6 @@ class Const {
   static TRANSPORT_TYPE_MC = 2;
   static TRANSPORT_TYPE_TLS = 3;
   
-  static transportTypeNames = [
-    'tcp',
-    'udp',
-    'mc',
-    'tls'
-  ];
-  
-  static TRANSPORT_LINE_CSSES = [
-    'seq_dia_protocol_tcp_line',
-    'seq_dia_protocol_udp_line',
-    'seq_dia_protocol_mc_line',
-    'seq_dia_protocol_tls_line'
-  ];
-  
   static PROTOCOL_LINE_NONE = -1;
   static PROTOCOL_LINE_CONNECTION = 0;
   static PROTOCOL_LINE_MESSAGE = 1;
@@ -70,6 +56,9 @@ class Const {
   
   static LOCAL_PART = 0;
   static REMOTE_PART = 1;
+  
+  static EAST = 0;
+  static WEST = 1;
   static EAST_START = 0;
   static EAST_STOP = 1;
   static WEST_START = 2;
@@ -77,56 +66,73 @@ class Const {
   static UNKNOWN_START = 4;
   static EAST_MIDDLE = 5;
   static WEST_MIDDLE = 6;
+  
+  static MESSAGE_DIRECTION_RECEIVED = 0;
+  static MESSAGE_DIRECTION_SENT = 1;
+  static MESSAGE_DIRECTION = [
+    'seq_dia_msg_nbr_received',
+    'seq_dia_msg_nbr_sent'
+  ];
+  
+  static MESSAGE_DIRECTION_FILTER = [
+    'seq_dia_show__message_event__received_numbers',
+    'seq_dia_show__message_event__sent_numbers'
+  ];
+  
+  static MESSAGE_NORMAL = 0;
+  static MESSAGE_DETAIL = 1;
+  
+  static transportTypeNames = [
+    'tcp',
+    'udp',
+    'mc',
+    'tls'
+  ];
+  
+  static TRANSPORT_LINE_CSSES = [
+    'seq_dia_protocol_tcp_line',
+    'seq_dia_protocol_udp_line',
+    'seq_dia_protocol_mc_line',
+    'seq_dia_protocol_tls_line'
+  ];
+  
+  static EVENT_CONNECTING = 0;
+  static EVENT_TCP = 1;
+  static EVENT_UDP = 2;
+  static EVENT_MC = 3;
+  static EVENT_TLS = 4;
+  
+  static events = new Map([['connecting', {
+    index: Const.EVENT_CONNECTING,
+    classLine: 'seq_dia_protocol_connection_line'
+  }], ['tcp', {
+    index: Const.EVENT_TCP,
+    classLine: 'event_tcp_line'
+  }], ['udp', {
+    index: Const.EVENT_UDP,
+    classLine: 'event_udp_line'
+  }], ['mc', {
+    index: Const.EVENT_MC,
+    classLine: 'event_mc_line'
+  }], ['tls', {
+    index: Const.EVENT_TLS,
+    classLine: 'event_tls_line'
+  }]]);
+  
+  static transportTypes = new Map(
+  [[0, {
+    lineEventId: Const.EVENT_TCP
+  }], [1, {
+    lineEventId: Const.EVENT_UDP
+  }], [2, {
+    lineEventId: Const.EVENT_MC
+  }], [3, {
+    lineEventId: Const.EVENT_TLS
+  }]]);
 }
 
 
-Const.MESSAGE_DIRECTION_RECEIVED = 0;
-Const.MESSAGE_DIRECTION_SENT = 1;
-Const.MESSAGE_DIRECTION = [
-  'seq_dia_msg_nbr_received',
-  'seq_dia_msg_nbr_sent'
-];
-Const.MESSAGE_DIRECTION_FILTER = [
-  'seq_dia_show__message_event__received_numbers',
-  'seq_dia_show__message_event__sent_numbers'
-];
 
-Const.MESSAGE_NORMAL = 0;
-Const.MESSAGE_DETAIL = 1;
-
-Const.EVENT_CONNECTING = 0;
-Const.EVENT_TCP = 1;
-Const.EVENT_UDP = 2;
-Const.EVENT_MC = 3;
-Const.EVENT_TLS = 4;
-
-Const.events = new Map([['connecting', {
-  index: Const.EVENT_CONNECTING,
-  classLine: 'seq_dia_protocol_connection_line'
-}], ['tcp', {
-  index: Const.EVENT_TCP,
-  classLine: 'event_tcp_line'
-}], ['udp', {
-  index: Const.EVENT_UDP,
-  classLine: 'event_udp_line'
-}], ['mc', {
-  index: Const.EVENT_MC,
-  classLine: 'event_mc_line'
-}], ['tls', {
-  index: Const.EVENT_TLS,
-  classLine: 'event_tls_line'
-}]]);
-
-Const.transportTypes = new Map(
-[[0, {
-  lineEventId: Const.EVENT_TCP
-}], [1, {
-  lineEventId: Const.EVENT_UDP
-}], [2, {
-  lineEventId: Const.EVENT_MC
-}], [3, {
-  lineEventId: Const.EVENT_TLS
-}]]);
 
 Const.REVERS_DIRECTION_FALSE = 0;
 Const.REVERS_DIRECTION_TRUE = 1;
@@ -134,8 +140,7 @@ Const.REVERS_DIRECTION_TRUE = 1;
 Const.HIDE = 0;
 Const.SHOW = 1;
 
-Const.EAST = 0;
-Const.WEST = 1;
+
 Const.CLOSED = 0;
 Const.OPEN = 1;
 
@@ -179,7 +184,7 @@ Const.LINE_WIDTH_HALF = Const.LINE_WIDTH / 2;
 
 Const.TEXT_BIAS = 17;
 
-Const.phaseClasses = [
+/*Const.phaseClasses = [
   'seq_dia_phase_data',
   'seq_dia_phase_pre',
   'seq_dia_phase_exec',
@@ -201,7 +206,7 @@ Const.phaseNames = [
   'Execution',
   'Postcondition',
   'None'
-];
+];*/
 
 
 module.exports = Const;

package/project/client/logic/seq-dia-filter.js

@@ -145,7 +145,11 @@ class SeqDiaFilter {
     this.guiInstanceData = sequenceDiagramFilter.guiInstanceData;
     this.guiProtocolData = sequenceDiagramFilter.guiProtocolData;
     
-    this.phases = sequenceDiagramFilter.phases;
+    this.phases[ActorPhaseConst.DATA] = sequenceDiagramFilter.phaseData;
+    this.phases[ActorPhaseConst.PRE] = sequenceDiagramFilter.phasePrecondition;
+    this.phases[ActorPhaseConst.EXEC] = sequenceDiagramFilter.phaseExecution;
+    this.phases[ActorPhaseConst.POST] = sequenceDiagramFilter.phasePostcondition;
+    this.phases[ActorPhaseConst.NONE] = sequenceDiagramFilter.phaseNone;
     
     /////////////////////
     
@@ -186,11 +190,11 @@ class SeqDiaFilter {
         
     ///////////////////
     
-    this.seq_dia_show__phase_data__actor_column = this._createFilter('seq_dia_show__phase_data__actor_column', 'div', sequenceDiagramFilter.phases[ActorPhaseConst.DATA]);
-    this.seq_dia_show__phase_pre__actor_column = this._createFilter('seq_dia_show__phase_pre__actor_column', 'div', sequenceDiagramFilter.phases[ActorPhaseConst.DATA] || sequenceDiagramFilter.phases[ActorPhaseConst.PRE]);
-    this.seq_dia_show__phase_exec__actor_column = this._createFilter('seq_dia_show__phase_exec__actor_column', 'div', sequenceDiagramFilter.phases[ActorPhaseConst.DATA] || sequenceDiagramFilter.phases[ActorPhaseConst.EXEC]);
-    this.seq_dia_show__phase_post__actor_column = this._createFilter('seq_dia_show__phase_post__actor_column', 'div', sequenceDiagramFilter.phases[ActorPhaseConst.DATA] || sequenceDiagramFilter.phases[ActorPhaseConst.POST]);
-    this.seq_dia_show__phase_pre_post__actor_column = this._createFilter('seq_dia_show__phase_pre_post__actor_column', 'div', sequenceDiagramFilter.phases[ActorPhaseConst.DATA] || sequenceDiagramFilter.phases[ActorPhaseConst.PRE] || sequenceDiagramFilter.phases[ActorPhaseConst.POST]);
+    this.seq_dia_show__phase_data__actor_column = this._createFilter('seq_dia_show__phase_data__actor_column', 'div', sequenceDiagramFilter.phaseData);
+    this.seq_dia_show__phase_pre__actor_column = this._createFilter('seq_dia_show__phase_pre__actor_column', 'div', sequenceDiagramFilter.phaseData || sequenceDiagramFilter.phasePrecondition);
+    this.seq_dia_show__phase_exec__actor_column = this._createFilter('seq_dia_show__phase_exec__actor_column', 'div', sequenceDiagramFilter.phaseData || sequenceDiagramFilter.phaseExecution);
+    this.seq_dia_show__phase_post__actor_column = this._createFilter('seq_dia_show__phase_post__actor_column', 'div', sequenceDiagramFilter.phaseData || sequenceDiagramFilter.phasePostcondition);
+    this.seq_dia_show__phase_pre_post__actor_column = this._createFilter('seq_dia_show__phase_pre_post__actor_column', 'div', sequenceDiagramFilter.phaseData || sequenceDiagramFilter.phasePrecondition || sequenceDiagramFilter.phasePostcondition);
     this.seq_dia_show__phase_all__actor_column = this._createFilter('seq_dia_show__phase_all__actor_column', 'div', true, -1);
     
     const cssRules = this.styleSheet.cssRules;
@@ -204,13 +208,13 @@ class SeqDiaFilter {
   update(sequenceDiagramFilter) {
    // console.log('seq-dia-filter');
     let isUpdated = false;
-    if(this.phases[ActorPhaseConst.DATA] !== sequenceDiagramFilter.phases[ActorPhaseConst.DATA]
-      || this.phases[ActorPhaseConst.PRE] !== sequenceDiagramFilter.phases[ActorPhaseConst.PRE]
-      || this.phases[ActorPhaseConst.EXEC] !== sequenceDiagramFilter.phases[ActorPhaseConst.EXEC]
-      || this.phases[ActorPhaseConst.POST] !== sequenceDiagramFilter.phases[ActorPhaseConst.POST]
-      || this.phases[ActorPhaseConst.NONE] !== sequenceDiagramFilter.phases[ActorPhaseConst.NONE]
+    if(this.phases[ActorPhaseConst.DATA] !== sequenceDiagramFilter.phaseData
+      || this.phases[ActorPhaseConst.PRE] !== sequenceDiagramFilter.phasePrecondition
+      || this.phases[ActorPhaseConst.EXEC] !== sequenceDiagramFilter.phaseExecution
+      || this.phases[ActorPhaseConst.POST] !== sequenceDiagramFilter.phasePostcondition
+      || this.phases[ActorPhaseConst.NONE] !== sequenceDiagramFilter.phaseNone
     ) {
-      this.setPhases(sequenceDiagramFilter.phases);
+      this.setPhases(sequenceDiagramFilter);
       isUpdated = true;
     }
     if(this.executedStateEvents !== sequenceDiagramFilter.executedStateEvents) {
@@ -287,8 +291,12 @@ class SeqDiaFilter {
     return isUpdated;
   }
   
-  setPhases(phases) {
-    this.phases = phases;
+  setPhases(sequenceDiagramFilter) {
+    this.phases[ActorPhaseConst.DATA] = sequenceDiagramFilter.phaseData;
+    this.phases[ActorPhaseConst.PRE] = sequenceDiagramFilter.phasePrecondition;
+    this.phases[ActorPhaseConst.EXEC] = sequenceDiagramFilter.phaseExecution;
+    this.phases[ActorPhaseConst.POST] = sequenceDiagramFilter.phasePostcondition;
+    this.phases[ActorPhaseConst.NONE] = sequenceDiagramFilter.phaseNone;
   }
   
   getPhase(phaseId) {