Skip to content

Commit 3294b1a

Browse files
javierdlrmSirOibaf
authored andcommitted
[HOPSWORKS-2656][HOPSWORKS-2662] Fix serving UI and set angular-material 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)
1 parent 8ccaa26 commit 3294b1a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

hopsworks-IT/src/test/ruby/spec/tfserving_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -342,8 +342,8 @@
342342
end
343343

344344
after :each do
345-
# Check if the process is
346-
wait_for_type("testModelChanged")
345+
serving = Serving.find(@serving[:id])
346+
wait_for_type(serving[:name])
347347
end
348348

349349
it "should be able to update the name" do

hopsworks-web/yo/app/scripts/controllers/servingCtrl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ angular.module('hopsWorksApp')
510510
if (self.isKubernetes) {
511511
self.artifactVersions = [{key: "0", value: self.artifactModelOnly}];
512512
self.artifactVersion = self.artifactVersions[0];
513-
self.editServing.artifactVersion = self.artifactVersion.key;
513+
self.editServing.artifactVersion = null; // set null to create the artifact if it doesn't exist
514514
}
515515
} else {
516516
self.editServing.transformer = path;

hopsworks-web/yo/app/views/serving.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ <h3 id="projectBread" style="border-bottom: none"></h3>
211211
ng-disabled="!servingCtrl.isKubernetes"
212212
ng-change="servingCtrl.setArtifactVersion(servingCtrl.artifactVersion)"></select>
213213
<!-- KFServing -->
214-
<md-checkbox style="margin-top: -2px; margin-bottom: -20px;"
214+
<md-checkbox style="margin-top: 7px; margin-bottom: -2px;"
215215
class="md-primary"
216216
name="kfserving"
217217
ng-model="servingCtrl.kfserving"
@@ -293,7 +293,7 @@ <h3 id="projectBread" style="border-bottom: none"></h3>
293293
</rzslider>
294294
<!-- Request batching -->
295295
<md-checkbox name="requestBatching"
296-
style="margin-top: 10px; margin-bottom: -20px;"
296+
style="margin-top: 17px; margin-bottom: -2px;"
297297
class="md-primary"
298298
ng-model="servingCtrl.editServing.batchingEnabled"
299299
ng-disabled="servingCtrl.kfserving || servingCtrl.editServing.modelServer === servingCtrl.modelServerFlask">

hopsworks-web/yo/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"angular-growl-v2": "^0.7.9",
4343
"angular-xeditable": "^0.2.0",
4444
"isteven-angular-multiselect": "angular-multi-select#^4.0.0",
45-
"angular-material": "^1.1.1",
45+
"angular-material": "1.1.22",
4646
"angular-material-data-table": "^0.10.9",
4747
"angularjs-slider": "^5.5.1",
4848
"angular-nvd3": "^1.0.9",

0 commit comments

Comments
 (0)