[HOPSWORKS-2656][HOPSWORKS-2662] Fix serving UI and set angular-mater…

…ial to v1.1.22 (#913) * [HOPSWORKS-2656] Fix sklearn serving creation with new artifact (#601) * [HOPSWORKS-2662] Fix angular-material version to 1.1.22 (#603)
logicalclocks · Jul 24, 2021 · 3294b1a · 3294b1a
1 parent 8ccaa26
commit 3294b1a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/hopsworks-IT/src/test/ruby/spec/tfserving_spec.rb b/hopsworks-IT/src/test/ruby/spec/tfserving_spec.rb
@@ -342,8 +342,8 @@
       end
 
       after :each do
-        # Check if the process is
-        wait_for_type("testModelChanged")
+        serving = Serving.find(@serving[:id])
+        wait_for_type(serving[:name])
       end
 
       it "should be able to update the name" do

diff --git a/hopsworks-web/yo/app/scripts/controllers/servingCtrl.js b/hopsworks-web/yo/app/scripts/controllers/servingCtrl.js
@@ -510,7 +510,7 @@ angular.module('hopsWorksApp')
                     if (self.isKubernetes) {
                         self.artifactVersions = [{key: "0", value: self.artifactModelOnly}];
                         self.artifactVersion = self.artifactVersions[0];
-                        self.editServing.artifactVersion = self.artifactVersion.key;
+                        self.editServing.artifactVersion = null; // set null to create the artifact if it doesn't exist
                     }
                 } else {
                     self.editServing.transformer = path;

diff --git a/hopsworks-web/yo/app/views/serving.html b/hopsworks-web/yo/app/views/serving.html
@@ -211,7 +211,7 @@ <h3 id="projectBread" style="border-bottom: none"></h3>
                                                 ng-disabled="!servingCtrl.isKubernetes"
                                                 ng-change="servingCtrl.setArtifactVersion(servingCtrl.artifactVersion)"></select>
                                         <!-- KFServing -->
-                                        <md-checkbox style="margin-top: -2px; margin-bottom: -20px;"
+                                        <md-checkbox style="margin-top: 7px; margin-bottom: -2px;"
                                                      class="md-primary"
                                                      name="kfserving"
                                                      ng-model="servingCtrl.kfserving"
@@ -293,7 +293,7 @@ <h3 id="projectBread" style="border-bottom: none"></h3>
                                             </rzslider>
                                             <!-- Request batching -->
                                             <md-checkbox name="requestBatching"
-                                                         style="margin-top: 10px; margin-bottom: -20px;"
+                                                         style="margin-top: 17px; margin-bottom: -2px;"
                                                          class="md-primary"
                                                          ng-model="servingCtrl.editServing.batchingEnabled"
                                                          ng-disabled="servingCtrl.kfserving || servingCtrl.editServing.modelServer === servingCtrl.modelServerFlask">

diff --git a/hopsworks-web/yo/bower.json b/hopsworks-web/yo/bower.json
@@ -42,7 +42,7 @@
     "angular-growl-v2": "^0.7.9",
     "angular-xeditable": "^0.2.0",
     "isteven-angular-multiselect": "angular-multi-select#^4.0.0",
-    "angular-material": "^1.1.1",
+    "angular-material": "1.1.22",
     "angular-material-data-table": "^0.10.9",
     "angularjs-slider": "^5.5.1",
     "angular-nvd3": "^1.0.9",