feat(api): add filter on worker model to filter by official worker mo…

…del #3733 (#3734) Signed-off-by: Benjamin Coenen <[email protected]>
ovh · Dec 17, 2018 · f535713 · f535713
1 parent 050268f
commit f535713
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/engine/api/worker/model.go b/engine/api/worker/model.go
@@ -73,6 +73,7 @@ const (
 	StateRegister   StateLoadOption = "register"
 	StateDeprecated StateLoadOption = "deprecated"
 	StateActive     StateLoadOption = "active"
+	StateOfficial   StateLoadOption = "official"
 )
 
 // InsertWorkerModel insert a new worker model in database
@@ -514,6 +515,8 @@ func getAdditionalSQLFilters(opts *StateLoadOption) []string {
 			additionalFilters = append(additionalFilters, "worker_model.is_deprecated = true")
 		case *opts == StateActive:
 			additionalFilters = append(additionalFilters, "worker_model.is_deprecated = false")
+		case *opts == StateOfficial:
+			additionalFilters = append(additionalFilters, fmt.Sprintf("worker_model.group_id = %d", group.SharedInfraGroup.ID))
 		}
 	}
 	return additionalFilters

diff --git a/engine/api/worker_model.go b/engine/api/worker_model.go
@@ -467,7 +467,7 @@ func (api *API) getWorkerModelsHandler() service.Handler {
 		state := r.FormValue("state")
 		var opt *worker.StateLoadOption
 		switch state {
-		case "", worker.StateDisabled.String(), worker.StateError.String(), worker.StateRegister.String(), worker.StateDeprecated.String(), worker.StateActive.String():
+		case "", worker.StateDisabled.String(), worker.StateOfficial.String(), worker.StateError.String(), worker.StateRegister.String(), worker.StateDeprecated.String(), worker.StateActive.String():
 			opt = new(worker.StateLoadOption)
 			*opt = worker.StateLoadOption(state)
 			break

diff --git a/ui/src/app/views/settings/worker-model/list/worker-model.list.html b/ui/src/app/views/settings/worker-model/list/worker-model.list.html
@@ -29,7 +29,7 @@
             <div class="ui one wide column"></div>
             <div class="ui four wide column">
               <sui-select class="selection" [placeholder]="'worker_model_state' | translate" [(ngModel)]="selectedFilter"
-                [options]="['', 'disabled', 'register', 'error', 'deprecated']" [isSearchable]="true" #selectFilter>
+                [options]="['', 'official', 'disabled', 'register', 'error', 'deprecated']" [isSearchable]="true" #selectFilter>
                 <sui-select-option *ngFor="let option of selectFilter.filteredOptions" [value]="option">
                 </sui-select-option>
               </sui-select>