mirror of https://github.com/portainer/portainer
feat(app): remove autocomplete on registry selector
parent
06c63899b2
commit
97ec2ddd62
|
@ -4,7 +4,6 @@ angular.module('portainer.docker').component('porImageRegistry', {
|
||||||
bindings: {
|
bindings: {
|
||||||
'model': '=', // must be of type PorImageRegistryModel
|
'model': '=', // must be of type PorImageRegistryModel
|
||||||
'pullWarning': '<',
|
'pullWarning': '<',
|
||||||
'autoComplete': '<',
|
|
||||||
'labelClass': '@',
|
'labelClass': '@',
|
||||||
'inputClass': '@'
|
'inputClass': '@'
|
||||||
},
|
},
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
<div ng-class="$ctrl.inputClass">
|
<div ng-class="$ctrl.inputClass">
|
||||||
<div class="input-group">
|
<div class="input-group">
|
||||||
<span class="input-group-addon" id="registry-name">{{$ctrl.model.Registry.URL || 'docker.io'}}</span>
|
<span class="input-group-addon" id="registry-name">{{$ctrl.model.Registry.URL || 'docker.io'}}</span>
|
||||||
<input type="text" class="form-control" aria-describedby="registry-name" uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5"
|
<input type="text" class="form-control" aria-describedby="registry-name"
|
||||||
ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. myImage:myTag" required>
|
ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. myImage:myTag" required>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -3,11 +3,10 @@ import _ from 'lodash-es';
|
||||||
|
|
||||||
class porImageRegistryController {
|
class porImageRegistryController {
|
||||||
/* @ngInject */
|
/* @ngInject */
|
||||||
constructor($async, RegistryService, DockerHubService, ImageService, Notifications) {
|
constructor($async, RegistryService, DockerHubService, Notifications) {
|
||||||
this.$async = $async;
|
this.$async = $async;
|
||||||
this.RegistryService = RegistryService;
|
this.RegistryService = RegistryService;
|
||||||
this.DockerHubService = DockerHubService;
|
this.DockerHubService = DockerHubService;
|
||||||
this.ImageService = ImageService;
|
|
||||||
this.Notifications = Notifications;
|
this.Notifications = Notifications;
|
||||||
|
|
||||||
this.onInit = this.onInit.bind(this);
|
this.onInit = this.onInit.bind(this);
|
||||||
|
@ -15,12 +14,10 @@ class porImageRegistryController {
|
||||||
|
|
||||||
async onInit() {
|
async onInit() {
|
||||||
try {
|
try {
|
||||||
const [registries, dockerhub, availableImages] = await Promise.all([
|
const [registries, dockerhub] = await Promise.all([
|
||||||
this.RegistryService.registries(),
|
this.RegistryService.registries(),
|
||||||
this.DockerHubService.dockerhub(),
|
this.DockerHubService.dockerhub(),
|
||||||
this.autoComplete ? this.ImageService.images() : []
|
|
||||||
]);
|
]);
|
||||||
this.availableImages = this.ImageService.getUniqueTagListFromImages(availableImages);
|
|
||||||
this.availableRegistries = _.concat(dockerhub, registries);
|
this.availableRegistries = _.concat(dockerhub, registries);
|
||||||
|
|
||||||
const id = this.model.Registry.Id;
|
const id = this.model.Registry.Id;
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
model="formValues.RegistryModel"
|
model="formValues.RegistryModel"
|
||||||
pull-warning="formValues.alwaysPull"
|
pull-warning="formValues.alwaysPull"
|
||||||
ng-if="formValues.RegistryModel.Registry"
|
ng-if="formValues.RegistryModel.Registry"
|
||||||
auto-complete="true"
|
|
||||||
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
||||||
></por-image-registry>
|
></por-image-registry>
|
||||||
<!-- !image-and-registry -->
|
<!-- !image-and-registry -->
|
||||||
|
|
|
@ -156,7 +156,6 @@
|
||||||
<!-- image-and-registry -->
|
<!-- image-and-registry -->
|
||||||
<por-image-registry
|
<por-image-registry
|
||||||
model="config.RegistryModel"
|
model="config.RegistryModel"
|
||||||
auto-complete="true"
|
|
||||||
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
||||||
></por-image-registry>
|
></por-image-registry>
|
||||||
<!-- !image-and-registry -->
|
<!-- !image-and-registry -->
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
<!-- image-and-registry -->
|
<!-- image-and-registry -->
|
||||||
<por-image-registry
|
<por-image-registry
|
||||||
model="formValues.RegistryModel"
|
model="formValues.RegistryModel"
|
||||||
auto-complete="true"
|
|
||||||
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
||||||
></por-image-registry>
|
></por-image-registry>
|
||||||
<!-- !image-and-registry -->
|
<!-- !image-and-registry -->
|
||||||
|
|
|
@ -6,7 +6,6 @@
|
||||||
<form class="form-horizontal">
|
<form class="form-horizontal">
|
||||||
<por-image-registry
|
<por-image-registry
|
||||||
model="formValues.RegistryModel"
|
model="formValues.RegistryModel"
|
||||||
auto-complete="true"
|
|
||||||
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
||||||
></por-image-registry>
|
></por-image-registry>
|
||||||
</form>
|
</form>
|
||||||
|
|
|
@ -204,7 +204,6 @@
|
||||||
<div uib-collapse="$ctrl.state.collapseContainer">
|
<div uib-collapse="$ctrl.state.collapseContainer">
|
||||||
<por-image-registry
|
<por-image-registry
|
||||||
model="$ctrl.model.RegistryModel"
|
model="$ctrl.model.RegistryModel"
|
||||||
auto-complete="true"
|
|
||||||
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
label-class="col-sm-1" input-class="col-sm-11 col-md-5"
|
||||||
></por-image-registry>
|
></por-image-registry>
|
||||||
<!-- command -->
|
<!-- command -->
|
||||||
|
|
Loading…
Reference in New Issue