diff options
author | Thong Kuah <tkuah@gitlab.com> | 2018-11-01 13:39:01 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2018-11-01 19:37:33 +1300 |
commit | 1a1fdf8efe1923ba781e978e858c009264020e72 (patch) | |
tree | df98af221d7a722e4c67db450b78a5488bff6a3c /app/assets | |
parent | 28dabc67f4db8271ac20c0db458ae2c86a906eee (diff) | |
download | gitlab-ce-1a1fdf8efe1923ba781e978e858c009264020e72.tar.gz |
Resolve controller sharing concern
Use ClustersController as base while having Projects::ClustersController
to inform what `clusterable` is. Thanks @ayufan for the great suggestion
!
- View changes to work with new approach
- Fix javascript for new approach
- Fix feature specs for new approach
- Fix QA
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/pages/clusters/create_gcp/index.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/clusters/create_user/index.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/clusters/new/index.js | 7 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/clusters/destroy/index.js (renamed from app/assets/javascripts/pages/clusters/destroy/index.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/clusters/index/index.js (renamed from app/assets/javascripts/pages/clusters/index/index.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/clusters/show/index.js (renamed from app/assets/javascripts/pages/clusters/show/index.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/clusters/update/index.js (renamed from app/assets/javascripts/pages/clusters/update/index.js) | 0 | ||||
-rw-r--r-- | app/assets/javascripts/pages/projects/index.js | 14 |
8 files changed, 14 insertions, 21 deletions
diff --git a/app/assets/javascripts/pages/clusters/create_gcp/index.js b/app/assets/javascripts/pages/clusters/create_gcp/index.js deleted file mode 100644 index e7c8cc4ab5f..00000000000 --- a/app/assets/javascripts/pages/clusters/create_gcp/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import initDismissableCallout from '~/dismissable_callout'; -import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; - -document.addEventListener('DOMContentLoaded', () => { - initDismissableCallout('.gcp-signup-offer'); - initGkeDropdowns(); -}); diff --git a/app/assets/javascripts/pages/clusters/create_user/index.js b/app/assets/javascripts/pages/clusters/create_user/index.js deleted file mode 100644 index e7c8cc4ab5f..00000000000 --- a/app/assets/javascripts/pages/clusters/create_user/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import initDismissableCallout from '~/dismissable_callout'; -import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; - -document.addEventListener('DOMContentLoaded', () => { - initDismissableCallout('.gcp-signup-offer'); - initGkeDropdowns(); -}); diff --git a/app/assets/javascripts/pages/clusters/new/index.js b/app/assets/javascripts/pages/clusters/new/index.js deleted file mode 100644 index e7c8cc4ab5f..00000000000 --- a/app/assets/javascripts/pages/clusters/new/index.js +++ /dev/null @@ -1,7 +0,0 @@ -import initDismissableCallout from '~/dismissable_callout'; -import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; - -document.addEventListener('DOMContentLoaded', () => { - initDismissableCallout('.gcp-signup-offer'); - initGkeDropdowns(); -}); diff --git a/app/assets/javascripts/pages/clusters/destroy/index.js b/app/assets/javascripts/pages/projects/clusters/destroy/index.js index 8001d2dd1da..8001d2dd1da 100644 --- a/app/assets/javascripts/pages/clusters/destroy/index.js +++ b/app/assets/javascripts/pages/projects/clusters/destroy/index.js diff --git a/app/assets/javascripts/pages/clusters/index/index.js b/app/assets/javascripts/pages/projects/clusters/index/index.js index e4b8baede58..e4b8baede58 100644 --- a/app/assets/javascripts/pages/clusters/index/index.js +++ b/app/assets/javascripts/pages/projects/clusters/index/index.js diff --git a/app/assets/javascripts/pages/clusters/show/index.js b/app/assets/javascripts/pages/projects/clusters/show/index.js index 8001d2dd1da..8001d2dd1da 100644 --- a/app/assets/javascripts/pages/clusters/show/index.js +++ b/app/assets/javascripts/pages/projects/clusters/show/index.js diff --git a/app/assets/javascripts/pages/clusters/update/index.js b/app/assets/javascripts/pages/projects/clusters/update/index.js index 8001d2dd1da..8001d2dd1da 100644 --- a/app/assets/javascripts/pages/clusters/update/index.js +++ b/app/assets/javascripts/pages/projects/clusters/update/index.js diff --git a/app/assets/javascripts/pages/projects/index.js b/app/assets/javascripts/pages/projects/index.js index 8e0af018b61..5659e13981a 100644 --- a/app/assets/javascripts/pages/projects/index.js +++ b/app/assets/javascripts/pages/projects/index.js @@ -1,7 +1,21 @@ +import initDismissableCallout from '~/dismissable_callout'; +import initGkeDropdowns from '~/projects/gke_cluster_dropdowns'; import Project from './project'; import ShortcutsNavigation from '../../behaviors/shortcuts/shortcuts_navigation'; document.addEventListener('DOMContentLoaded', () => { + const { page } = document.body.dataset; + const newClusterViews = [ + 'projects:clusters:new', + 'projects:clusters:create_gcp', + 'projects:clusters:create_user', + ]; + + if (newClusterViews.indexOf(page) > -1) { + initDismissableCallout('.gcp-signup-offer'); + initGkeDropdowns(); + } + new Project(); // eslint-disable-line no-new new ShortcutsNavigation(); // eslint-disable-line no-new }); |