fix(fix gitlab-ci): fix gitlab ci stages

.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
   - build_in_devel
   - cleanup_build
   - build_in_master
-  - build_in_devel_windows
+  - build_in_staging
 build_in_devel:
   before_script:
     - $env:TAG_VERSION=(git describe --tag --abbrev=0)
@@ -35,9 +35,12 @@ build_in_devel:
     - devel
 
 
-build_in_devel_windows:
+build_in_staging:
   before_script:
     - $env:TAG_VERSION=(git describe --tag --abbrev=0)
+    - $env:BRANCHFULLNAME=(git name-rev --name-only HEAD)
+    - $env:BRANCHNAME=$env:BRANCHFULLNAME.Split('/')[$env:BRANCHFULLNAME.Split('/').length - 1]
+    - echo $env:BRANCHNAME.Split('_')[1]
     - docker login -u reza.s -p aA123456 repo.marcopacs.com
   stage: build_in_devel_windows
   tags:
@@ -66,10 +69,10 @@ build_in_devel_windows:
     - echo y | plink -batch -ssh administrator@staging.karname.ir -pw $env:StagingPass -m ./command.bat
     # - ./scripts/command.ps1
   allow_failure: true
-  only:
-    - devel-windows
   # only:
-  #   - /^staging_.*/
+  #   - devel-windows
+  only:
+    - /^staging_.*/
 
 build_in_master:
   before_script:
@@ -79,14 +82,11 @@ build_in_master:
     - shell
   script: 
     - echo "starting build in master"
-    - npm install
-    - npm run test-jest
-    - docker-compose config
-    - docker-compose build
-    - docker-compose up -d --force-recreate
   allow_failure: true
   only:
-    - master
+    - tags
+  except:
+    - /^(?!master).+@/
 
 on_build_failure:
   stage: cleanup_build

client/components/HisWorklist.vue

@@ -28,8 +28,7 @@
                 class="elevation-1"
                 style="width:100%"
                 fixed-header
-                hide-default-footer
-                disable-pagination
+                disable-sort
                 height="600px"
               ></v-data-table>
             </v-row>

imports/api/server/publications/brands.js

@@ -6,9 +6,8 @@ Meteor.publish("brands", function() {
         return this.ready();
     }
     return Brands.find({}, {
-        reactive: true,
-        disableOplog: false,
-        pollingThrottleMs: 1000,
+        disableOplog: true,
+        // pollingThrottleMs: 1000,
         pollingIntervalMs: 1000
     });
 });
\ No newline at end of file

imports/api/server/publications/clients.js

@@ -10,9 +10,9 @@ Meteor.publish("clients", function() {
 
     if (this.userId) {
         return Clients.find({}, {
-            reactive: true,
-            disableOplog: false,
-            pollingThrottleMs: 1000,
+
+            disableOplog: true,
+            // pollingThrottleMs: 1000,
             pollingIntervalMs: 1000
         })
     } else {

imports/api/server/publications/devicecode.js

@@ -6,9 +6,9 @@ Meteor.publish("devicecode", function() {
         return this.ready();
     }
     return DeviceCode.find({}, {
-        reactive: true,
-        disableOplog: false,
-        pollingThrottleMs: 1000,
+
+        disableOplog: true,
+        // pollingThrottleMs: 1000,
         pollingIntervalMs: 1000
     });
 });
\ No newline at end of file

imports/api/server/publications/devicemap.js

@@ -7,9 +7,9 @@ Meteor.publish("devicemaps", function() {
         return this.ready();
     }
     return DeviceMap.find({}, {
-        reactive: true,
+
         disableOplog: true,
-        pollingThrottleMs: 1000,
+        // pollingThrottleMs: 1000,
         pollingIntervalMs: 1000
     });
 });
\ No newline at end of file

imports/api/server/publications/hislink.js

@@ -6,9 +6,9 @@ Meteor.publish("hislink", function() {
         return this.ready();
     }
     return HisLink.find({}, {
-        reactive: true,
-        disableOplog: false,
-        pollingThrottleMs: 1000,
+
+        disableOplog: true,
+        // pollingThrottleMs: 1000,
         pollingIntervalMs: 1000
     });
 });
\ No newline at end of file

imports/api/server/publications/worklist4hislink.js

@@ -16,9 +16,8 @@ Meteor.publish("worklist4hislink", function(brand) {
     // let Worklist = new Mongo.Collection(brand);
     // console.log(Worklist.find({ _userid: userid, _devicemap: devicemap }).fetch())
     return Collections[brand].find({}, {
-        reactive: true,
-        disableOplog: false,
-        pollingThrottleMs: 1000,
+        disableOplog: true,
+        // pollingThrottleMs: 1000,
         pollingIntervalMs: 1000
     });
 });
\ No newline at end of file