diff options
Diffstat (limited to 'app')
7 files changed, 28 insertions, 29 deletions
diff --git a/app/assets/javascripts/registry/components/app.vue b/app/assets/javascripts/registry/components/app.vue index 346dc470a59..60aaef656a0 100644 --- a/app/assets/javascripts/registry/components/app.vue +++ b/app/assets/javascripts/registry/components/app.vue @@ -47,7 +47,7 @@ export default { dockerConnectionErrorText() { return sprintf( s__(`ContainerRegistry|We are having trouble connecting to Docker, which could be due to an - issue with your project name or path. + issue with your project name or path. %{docLinkStart}More Information%{docLinkEnd}`), { docLinkStart: `<a href="${this.helpPagePath}#docker-connection-error" target="_blank">`, @@ -58,8 +58,8 @@ export default { }, introText() { return sprintf( - s__(`ContainerRegistry|With the Docker Container Registry integrated into GitLab, every - project can have its own space to store its Docker images. + s__(`ContainerRegistry|With the Docker Container Registry integrated into GitLab, every + project can have its own space to store its Docker images. %{docLinkStart}More Information%{docLinkEnd}`), { docLinkStart: `<a href="${this.helpPagePath}" target="_blank">`, @@ -109,7 +109,7 @@ export default { :svg-path="containersErrorImage" > <template #description> - <p v-html="dockerConnectionErrorText"></p> + <p class="js-character-error-text" v-html="dockerConnectionErrorText"></p> </template> </gl-empty-state> diff --git a/app/assets/javascripts/registry/components/collapsible_container.vue b/app/assets/javascripts/registry/components/collapsible_container.vue index bfb2305c48c..41bd9225c6e 100644 --- a/app/assets/javascripts/registry/components/collapsible_container.vue +++ b/app/assets/javascripts/registry/components/collapsible_container.vue @@ -49,7 +49,7 @@ export default { } }, handleDeleteRepository() { - this.deleteItem(this.repo) + return this.deleteItem(this.repo) .then(() => { createFlash(__('This container registry has been scheduled for deletion.'), 'notice'); this.fetchRepos(); @@ -67,7 +67,8 @@ export default { <div class="container-image"> <div class="container-image-head"> <gl-button class="js-toggle-repo btn-link align-baseline" @click="toggleRepo"> - <icon :name="iconName" /> {{ repo.name }} + <icon :name="iconName" /> + {{ repo.name }} </gl-button> <clipboard-button diff --git a/app/assets/javascripts/registry/components/table_registry.vue b/app/assets/javascripts/registry/components/table_registry.vue index e9067bc2b56..ec0bad58b79 100644 --- a/app/assets/javascripts/registry/components/table_registry.vue +++ b/app/assets/javascripts/registry/components/table_registry.vue @@ -198,8 +198,9 @@ export default { :title="s__('ContainerRegistry|Remove selected images')" :aria-label="s__('ContainerRegistry|Remove selected images')" @click="deleteMultipleItems()" - ><icon name="remove" - /></gl-button> + > + <icon name="remove" /> + </gl-button> </th> </tr> </thead> @@ -223,9 +224,9 @@ export default { /> </td> <td> - <span v-gl-tooltip.bottom class="monospace" :title="item.revision"> - {{ item.shortRevision }} - </span> + <span v-gl-tooltip.bottom class="monospace" :title="item.revision">{{ + item.shortRevision + }}</span> </td> <td> {{ formatSize(item.size) }} @@ -236,9 +237,9 @@ export default { </td> <td> - <span v-gl-tooltip.bottom :title="tooltipTitle(item.createdAt)"> - {{ timeFormated(item.createdAt) }} - </span> + <span v-gl-tooltip.bottom :title="tooltipTitle(item.createdAt)">{{ + timeFormated(item.createdAt) + }}</span> </td> <td class="content action-buttons"> @@ -262,6 +263,7 @@ export default { v-if="shouldRenderPagination" :change="onPageChange" :page-info="repo.pagination" + class="js-registry-pagination" /> <gl-modal ref="deleteModal" :modal-id="modalId" ok-variant="danger"> diff --git a/app/finders/clusters/kubernetes_namespace_finder.rb b/app/finders/clusters/kubernetes_namespace_finder.rb index e947796c1e7..82df96ed79e 100644 --- a/app/finders/clusters/kubernetes_namespace_finder.rb +++ b/app/finders/clusters/kubernetes_namespace_finder.rb @@ -2,12 +2,12 @@ module Clusters class KubernetesNamespaceFinder - attr_reader :cluster, :project, :environment_slug + attr_reader :cluster, :project, :environment_name - def initialize(cluster, project:, environment_slug:, allow_blank_token: false) + def initialize(cluster, project:, environment_name:, allow_blank_token: false) @cluster = cluster @project = project - @environment_slug = environment_slug + @environment_name = environment_name @allow_blank_token = allow_blank_token end @@ -20,7 +20,11 @@ module Clusters attr_reader :allow_blank_token def find_namespace(with_environment:) - relation = with_environment ? namespaces.with_environment_slug(environment_slug) : namespaces + relation = if with_environment + namespaces.with_environment_name(environment_name) + else + namespaces + end relation.find_by_project_id(project.id) end diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 2df30e8ac36..49bed479c02 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -172,7 +172,7 @@ module Clusters persisted_namespace = Clusters::KubernetesNamespaceFinder.new( self, project: project, - environment_slug: environment.slug + environment_name: environment.name ).execute persisted_namespace&.namespace || Gitlab::Kubernetes::DefaultNamespace.new(self, project: project).from_environment_slug(environment.slug) diff --git a/app/models/clusters/kubernetes_namespace.rb b/app/models/clusters/kubernetes_namespace.rb index 69a2b99fcb6..42332bdc193 100644 --- a/app/models/clusters/kubernetes_namespace.rb +++ b/app/models/clusters/kubernetes_namespace.rb @@ -27,7 +27,7 @@ module Clusters algorithm: 'aes-256-cbc' scope :has_service_account_token, -> { where.not(encrypted_service_account_token: nil) } - scope :with_environment_slug, -> (slug) { joins(:environment).where(environments: { slug: slug }) } + scope :with_environment_name, -> (name) { joins(:environment).where(environments: { name: name }) } def token_name "#{namespace}-token" diff --git a/app/models/clusters/platforms/kubernetes.rb b/app/models/clusters/platforms/kubernetes.rb index 89b50d8e8ff..aa2a7f3d7f1 100644 --- a/app/models/clusters/platforms/kubernetes.rb +++ b/app/models/clusters/platforms/kubernetes.rb @@ -105,19 +105,11 @@ module Clusters private - ## - # Environment slug can be predicted given an environment - # name, so even if the environment isn't persisted yet we - # still know what to look for. - def environment_slug(name) - Gitlab::Slug::Environment.new(name).generate - end - def find_persisted_namespace(project, environment_name:) Clusters::KubernetesNamespaceFinder.new( cluster, project: project, - environment_slug: environment_slug(environment_name) + environment_name: environment_name ).execute end |