Commit 319ebaef authored by Dennis Tang's avatar Dennis Tang

update view name for gke dropdown check

parent 70c65e82
...@@ -5,7 +5,7 @@ import ShortcutsNavigation from '../../shortcuts_navigation'; ...@@ -5,7 +5,7 @@ import ShortcutsNavigation from '../../shortcuts_navigation';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const page = document.body.dataset.page; const page = document.body.dataset.page;
const newClusterViews = ['projects:clusters:new', 'projects:clusters:create_cluster']; const newClusterViews = ['projects:clusters:new', 'projects:clusters:create'];
if (newClusterViews.indexOf(page) > -1) { if (newClusterViews.indexOf(page) > -1) {
gcpSignupOffer(); gcpSignupOffer();
......
...@@ -2,6 +2,7 @@ class Projects::ClustersController < Projects::ApplicationController ...@@ -2,6 +2,7 @@ class Projects::ClustersController < Projects::ApplicationController
before_action :cluster, except: [:index, :new, :create] before_action :cluster, except: [:index, :new, :create]
before_action :authorize_read_cluster! before_action :authorize_read_cluster!
before_action :generate_gcp_authorize_url, only: [:new] before_action :generate_gcp_authorize_url, only: [:new]
before_action :validate_gcp_token, only: [:new]
before_action :new_cluster, only: [:new] before_action :new_cluster, only: [:new]
before_action :existing_cluster, only: [:new] before_action :existing_cluster, only: [:new]
before_action :authorize_create_cluster!, only: [:new] before_action :authorize_create_cluster!, only: [:new]
...@@ -83,6 +84,7 @@ class Projects::ClustersController < Projects::ApplicationController ...@@ -83,6 +84,7 @@ class Projects::ClustersController < Projects::ApplicationController
redirect_to project_cluster_path(project, @cluster) redirect_to project_cluster_path(project, @cluster)
else else
generate_gcp_authorize_url generate_gcp_authorize_url
validate_gcp_token
case params[:type] case params[:type]
when 'new' when 'new'
...@@ -171,10 +173,8 @@ class Projects::ClustersController < Projects::ApplicationController ...@@ -171,10 +173,8 @@ class Projects::ClustersController < Projects::ApplicationController
end end
def new_cluster def new_cluster
if valid_gcp_token @new_cluster = ::Clusters::Cluster.new.tap do |cluster|
@new_cluster = ::Clusters::Cluster.new.tap do |cluster| cluster.build_provider_gcp
cluster.build_provider_gcp
end
end end
end end
...@@ -184,7 +184,7 @@ class Projects::ClustersController < Projects::ApplicationController ...@@ -184,7 +184,7 @@ class Projects::ClustersController < Projects::ApplicationController
end end
end end
def valid_gcp_token def validate_gcp_token
@valid_gcp_token = GoogleApi::CloudPlatform::Client.new(token_in_session, nil) @valid_gcp_token = GoogleApi::CloudPlatform::Client.new(token_in_session, nil)
.validate_token(expires_at_in_session) .validate_token(expires_at_in_session)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment