chore(deps): bump dependencies to get bug fixes

Updates to an angular version that actually works! :). Also fixes some typos in the build script and test script.
IMA-WorldHealth · Feb 5, 2019 · 97bf5dc · 97bf5dc
1 parent a8fe7a8
commit 97bf5dc
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 130 deletions.
diff --git a/client/src/less/bhima-bootstrap.less b/client/src/less/bhima-bootstrap.less
@@ -465,3 +465,4 @@ div.ui-grid-cell .form-group.has-error input.ng-invalid {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
+
diff --git a/client/src/modules/account_reference/account_reference.modal.html b/client/src/modules/account_reference/account_reference.modal.html
@@ -56,8 +56,7 @@
         multiple="true"
         name="accounts"
         ng-model="AccountReferenceModalCtrl.accountReference.accounts"
-        close-on-select="false"
-        append-to-body="true">
+        close-on-select="false">
 
         <ui-select-match placeholder="{{ 'FORM.SELECT.ACCOUNTS' | translate }}">
           <span>{{$item.number}}</span>
@@ -82,8 +81,7 @@
         multiple="true"
         name="accountsException"
         ng-model="AccountReferenceModalCtrl.accountReference.accountsException"
-        close-on-select="false"
-        append-to-body="true">
+        close-on-select="false">
 
         <ui-select-match placeholder="{{ 'FORM.SELECT.ACCOUNTS' | translate }}">
           <span>{{$item.number}}</span>
@@ -99,26 +97,26 @@
         <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
       </div>
     </div>
+
     <!-- parent reference -->
     <div class="form-group" ng-class="{ 'has-error' : AccountReferenceForm.$submitted && AccountReferenceForm.parent.$invalid }">
-        <label class="control-label" translate>ACCOUNT.REFERENCE.PARENT_REFERENCE</label>
-        <bh-clear on-clear="AccountReferenceModalCtrl.clear('parent')"></bh-clear>
-        <ui-select
-          name="parent"
-          ng-model="AccountReferenceModalCtrl.accountReference.parent"
-          append-to-body="true">
-
-          <ui-select-match placeholder="{{ 'ACCOUNT.REFERENCE.PARENT_REFERENCE' | translate }}">
-            <span>{{$select.selected.abbr}}</span>
-          </ui-select-match>
-
-          <ui-select-choices repeat="reference.id as reference in AccountReferenceModalCtrl.references | filter:{abbr: $select.search}">
-            <strong ng-bind-html="reference.abbr | highlight:$select.search"></strong>
-          </ui-select-choices>
-        </ui-select>
-        <div class="help-block" ng-messages="AccountReferenceForm.parent.$error" ng-show="AccountReferenceForm.$submitted">
-          <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
-        </div>
+      <label class="control-label" translate>ACCOUNT.REFERENCE.PARENT_REFERENCE</label>
+      <bh-clear on-clear="AccountReferenceModalCtrl.clear('parent')"></bh-clear>
+      <ui-select
+        name="parent"
+        ng-model="AccountReferenceModalCtrl.accountReference.parent">
+
+        <ui-select-match placeholder="{{ 'ACCOUNT.REFERENCE.PARENT_REFERENCE' | translate }}">
+          <span>{{$select.selected.abbr}}</span>
+        </ui-select-match>
+
+        <ui-select-choices repeat="reference.id as reference in AccountReferenceModalCtrl.references | filter:{abbr: $select.search}">
+          <strong ng-bind-html="reference.abbr | highlight:$select.search"></strong>
+        </ui-select-choices>
+      </ui-select>
+      <div class="help-block" ng-messages="AccountReferenceForm.parent.$error" ng-show="AccountReferenceForm.$submitted">
+        <div ng-messages-include="modules/templates/messages.tmpl.html"></div>
+      </div>
     </div>
 
     <bh-account-reference-type-select

diff --git a/client/src/modules/templates/bhAccountReferenceTypeSelect.tmpl.html b/client/src/modules/templates/bhAccountReferenceTypeSelect.tmpl.html
@@ -8,11 +8,11 @@
     </label>
 
     <ng-transclude></ng-transclude>
+
     <ui-select
       name="reference_type_id"
       ng-model="$ctrl.referenceTypeId"
-      on-select="$ctrl.onSelect($item, $model)"
-      append-to-body="true">
+      on-select="$ctrl.onSelect($item, $model)">
       <ui-select-match placeholder="{{ 'FORM.SELECT.ACCOUNT_REFERENCE_TYPE' | translate }}">
         <span>{{$select.selected.label}}</span>
       </ui-select-match>

diff --git a/gulpfile.js b/gulpfile.js
@@ -167,12 +167,12 @@ function compileTypescript() {
     .pipe(iife())
     .pipe(rev())
     .pipe(dest(CLIENT_FOLDER)) // write revisioned javascript to build folder
-    .pipe(rev.manifest('rev-manifest-js.json', { merge : true }))
+    .pipe(rev.manifest('rev-manifest-js.json'))
     .pipe(dest(CLIENT_FOLDER)); // write manifest to build folder
 }
 
 function collectRevisionsIntoManifest() {
-  return src(`${CLIENT_FOLDER}/rev-*.json`)
+  return src(`${CLIENT_FOLDER}/rev-manifest-*.json`)
     .pipe(mergeJson({ fileName : 'rev-manifest.json' }))
     .pipe(dest(CLIENT_FOLDER));
 }
@@ -184,7 +184,7 @@ function compileCSS() {
     .pipe(gulpif(isProduction, cssnano({ zindex : false })))
     .pipe(rev())
     .pipe(dest(CLIENT_FOLDER))
-    .pipe(rev.manifest('rev-manifest-css.json', { merge : true }))
+    .pipe(rev.manifest('rev-manifest-css.json'))
     .pipe(dest(CLIENT_FOLDER));
 }
 
@@ -211,7 +211,7 @@ function buildVendor() {
     .pipe(concat('js/vendor/vendor.min.js'))
     .pipe(rev())
     .pipe(dest(CLIENT_FOLDER))
-    .pipe(rev.manifest('rev-manifest-vendor.json', { merge : true }))
+    .pipe(rev.manifest('rev-manifest-vendor.json'))
     .pipe(dest(CLIENT_FOLDER));
 }
 

diff --git a/package.json b/package.json
@@ -43,16 +43,16 @@
   ],
   "dependencies": {
     "@types/angular": "^1.6.53",
-    "@uirouter/angularjs": "^1.0.21",
+    "@uirouter/angularjs": "^1.0.22",
     "accounting-js": "^1.1.1",
-    "angular": "^1.7.6",
-    "angular-animate": "^1.7.6",
+    "angular": "^1.7.7",
+    "angular-animate": "^1.7.7",
     "angular-dynamic-locale": "^0.1.37",
     "angular-growl-notifications": "^2.6.0",
-    "angular-messages": "^1.7.6",
+    "angular-messages": "^1.7.7",
     "angular-moment": "^1.3.0",
-    "angular-sanitize": "^1.7.6",
-    "angular-touch": "^1.7.6",
+    "angular-sanitize": "^1.7.7",
+    "angular-touch": "^1.7.7",
     "angular-translate": "^2.18.1",
     "angular-translate-loader-static-files": "^2.18.1",
     "angular-translate-loader-url": "^2.18.1",
@@ -78,7 +78,7 @@
     "ioredis": "^4.5.1",
     "jquery": "^3.3.1",
     "jsbarcode": "^4.0.0-alpha.5",
-    "json-2-csv": "^3.1.1",
+    "json-2-csv": "^3.2.0",
     "juice": "^5.1.0",
     "lodash": "^4.17.11",
     "lzma-native": "^4.0.3",
@@ -92,7 +92,7 @@
     "ng-file-upload": "^12.2.13",
     "ngstorage": "^0.3.11",
     "q": "~1.5.1",
-    "snyk": "1.122.3",
+    "snyk": "^1.124.1",
     "stream-to-promise": "^2.2.0",
     "tempy": "^0.2.1",
     "typeface-open-sans": "^0.0.54",
@@ -101,21 +101,21 @@
     "uuid": "^3.3.2",
     "uuid-parse": "^1.0.0",
     "webcam": "^3.2.1",
-    "winston": "^3.1.0",
+    "winston": "^3.2.1",
     "wkhtmltopdf": "^0.3.4"
   },
   "devDependencies": {
-    "angular-mocks": "^1.7.6",
+    "angular-mocks": "^1.7.7",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "chai-datetime": "^1.5.0",
     "chai-http": "^1.0.0",
     "commitizen": "^3.0.5",
     "cz-conventional-changelog": "^2.1.0",
     "del": "^3.0.0",
-    "eslint": "^5.12.1",
+    "eslint": "^5.13.0",
     "eslint-config-airbnb-base": "^13.1.0",
-    "eslint-plugin-import": "^2.15.0",
+    "eslint-plugin-import": "^2.16.0",
     "gulp": "^4.0.0",
     "gulp-concat": "^2.6.1",
     "gulp-cssnano": "^2.1.3",
@@ -141,7 +141,7 @@
     "protractor": "^5.4.2",
     "rewire": "^4.0.1",
     "standard-version": "^4.4.0",
-    "typescript": "^3.2.4"
+    "typescript": "^3.3.1"
   },
   "homepage": "https://github.com/IMA-WorldHealth/bhima#readme",
   "directories": {

diff --git a/sh/test.sh b/sh/test.sh
@@ -32,7 +32,7 @@ startfold "Running server Unit Tests ......" "server-unit"
 endfold "server-unit" ;
 
 # run end to end tests
-startfold "Running Client Unit Tests..." "test-end-to-end";
+startfold "Running Client End to End Tests..." "test-end-to-end";
 ./sh/test-ends.sh
 endfold "test-end-to-end" ;