From 345ac03b7afb1dc9b941c53bc45cc3dfcf22e61c Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Thu, 29 Mar 2018 20:11:36 -0600 Subject: Address UX review - Keep 'Deploy Section' open upon save, otherwise the token might get lost - When an error appears, display the error inside the form and also keep the Deploy Section open - Changue copy of revoke modal --- app/helpers/deploy_tokens_helper.rb | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 app/helpers/deploy_tokens_helper.rb (limited to 'app/helpers/deploy_tokens_helper.rb') diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb new file mode 100644 index 00000000000..68e1d56e951 --- /dev/null +++ b/app/helpers/deploy_tokens_helper.rb @@ -0,0 +1,7 @@ +module DeployTokensHelper + def expand_deploy_tokens_section?(temporal_token, deploy_token) + temporal_token.present? || + deploy_token.errors.present? || + Rails.env.test? + end +end -- cgit v1.2.1 From 2c6c61815edada16c4477c938209c24c647e1798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Fri, 6 Apr 2018 00:07:36 +0200 Subject: Get rid of Redis when dealing with deploy tokens We use controller actions to pass a newly created token and errors --- app/helpers/deploy_tokens_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers/deploy_tokens_helper.rb') diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index 68e1d56e951..3ca567a2bdd 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -1,6 +1,6 @@ module DeployTokensHelper - def expand_deploy_tokens_section?(temporal_token, deploy_token) - temporal_token.present? || + def expand_deploy_tokens_section?(deploy_token) + deploy_token.persisted? || deploy_token.errors.present? || Rails.env.test? end -- cgit v1.2.1 From c4f56a88029c1fe73bf6efb062b5f77a65282fed Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Thu, 5 Apr 2018 22:02:13 -0500 Subject: Increase test suite around deploy tokens behavior Also, fixes broken specs --- app/helpers/deploy_tokens_helper.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/helpers/deploy_tokens_helper.rb') diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index 3ca567a2bdd..c791b4e68b3 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -4,4 +4,9 @@ module DeployTokensHelper deploy_token.errors.present? || Rails.env.test? end + + def container_registry_enabled? + Gitlab.config.registry.enabled && + can?(current_user, :read_container_image, @project) + end end -- cgit v1.2.1 From 29913816309c6f6387b20c8702bcc8e90ef3a984 Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Fri, 6 Apr 2018 09:30:21 -0500 Subject: Addresses database comments - Adds a default on expires_at datetime - Modifies deploy tokens views to handle default expires at value - Use datetime_with_timezone where possible - Remove unused scopes --- app/helpers/deploy_tokens_helper.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'app/helpers/deploy_tokens_helper.rb') diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index c791b4e68b3..8496cc2e4b2 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -5,8 +5,16 @@ module DeployTokensHelper Rails.env.test? end - def container_registry_enabled? + def container_registry_enabled?(project) Gitlab.config.registry.enabled && - can?(current_user, :read_container_image, @project) + can?(current_user, :read_container_image, project) + end + + def expires_at_value(expires_at) + expires_at unless expires_at >= DeployToken::FUTURE_DATE + end + + def show_expire_at?(token) + token.expires? && token.expires_at != DeployToken::FUTURE_DATE end end -- cgit v1.2.1 From 18a1569319af918fe3aff7564e344143d04d6aca Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Fri, 6 Apr 2018 11:23:45 -0500 Subject: Handles default expires_at date directly into DeployToken model --- app/helpers/deploy_tokens_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/helpers/deploy_tokens_helper.rb') diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index 8496cc2e4b2..31aa041b00a 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -11,10 +11,10 @@ module DeployTokensHelper end def expires_at_value(expires_at) - expires_at unless expires_at >= DeployToken::FUTURE_DATE + expires_at unless expires_at >= DeployToken::FOREVER end def show_expire_at?(token) - token.expires? && token.expires_at != DeployToken::FUTURE_DATE + token.expires? && token.expires_at != DeployToken::FOREVER end end -- cgit v1.2.1 From 5bc58bac2678aed9c8b2318f9f4d4825baa2b110 Mon Sep 17 00:00:00 2001 From: Mayra Cabrera Date: Fri, 6 Apr 2018 14:48:17 -0500 Subject: Handle limit for datetime attributes on MySQL The TIMESTAMP data type is used for values that contain both date and time parts. TIMESTAMP has a range of '1970-01-01 00:00:01' UTC to '2038-01-19 03:14:07' UTC. A Forever lib class was included to handle future dates for PostgreSQL and MySQL, also changes were made to DeployToken to enforce Forever.date Also removes extra conditional from JwtController --- app/helpers/deploy_tokens_helper.rb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/helpers/deploy_tokens_helper.rb') diff --git a/app/helpers/deploy_tokens_helper.rb b/app/helpers/deploy_tokens_helper.rb index 31aa041b00a..bd921322476 100644 --- a/app/helpers/deploy_tokens_helper.rb +++ b/app/helpers/deploy_tokens_helper.rb @@ -9,12 +9,4 @@ module DeployTokensHelper Gitlab.config.registry.enabled && can?(current_user, :read_container_image, project) end - - def expires_at_value(expires_at) - expires_at unless expires_at >= DeployToken::FOREVER - end - - def show_expire_at?(token) - token.expires? && token.expires_at != DeployToken::FOREVER - end end -- cgit v1.2.1