Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
bba9e727
Commit
bba9e727
authored
Jan 23, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added dispatcher imports for groups webpack bundle
parent
d2564dbc
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
25 additions
and
16 deletions
+25
-16
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+5
-0
app/assets/javascripts/groups/index.js
app/assets/javascripts/groups/index.js
+2
-2
app/assets/javascripts/pages/dashboard/groups/index/index.js
app/assets/javascripts/pages/dashboard/groups/index/index.js
+5
-0
app/assets/javascripts/pages/explore/groups/index.js
app/assets/javascripts/pages/explore/groups/index.js
+2
-0
app/assets/javascripts/pages/groups/show/index.js
app/assets/javascripts/pages/groups/show/index.js
+3
-0
app/views/dashboard/groups/_groups.html.haml
app/views/dashboard/groups/_groups.html.haml
+2
-0
app/views/dashboard/groups/index.html.haml
app/views/dashboard/groups/index.html.haml
+0
-3
app/views/explore/groups/_groups.html.haml
app/views/explore/groups/_groups.html.haml
+2
-0
app/views/explore/groups/index.html.haml
app/views/explore/groups/index.html.haml
+0
-3
app/views/groups/_children.html.haml
app/views/groups/_children.html.haml
+2
-3
config/webpack.config.js
config/webpack.config.js
+2
-5
No files found.
app/assets/javascripts/dispatcher.js
View file @
bba9e727
...
@@ -530,6 +530,11 @@ import SearchAutocomplete from './search_autocomplete';
...
@@ -530,6 +530,11 @@ import SearchAutocomplete from './search_autocomplete';
.
then
(
callDefault
)
.
then
(
callDefault
)
.
catch
(
fail
);
.
catch
(
fail
);
break
;
break
;
case
'
dashboard:groups:index
'
:
import
(
'
./pages/dashboard/groups/index
'
)
.
then
(
callDefault
)
.
catch
(
fail
);
break
;
}
}
switch
(
path
[
0
])
{
switch
(
path
[
0
])
{
case
'
sessions
'
:
case
'
sessions
'
:
...
...
app/assets/javascripts/groups/index.js
View file @
bba9e727
...
@@ -10,7 +10,7 @@ import groupItemComponent from './components/group_item.vue';
...
@@ -10,7 +10,7 @@ import groupItemComponent from './components/group_item.vue';
Vue
.
use
(
Translate
);
Vue
.
use
(
Translate
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-groups-tree
'
);
const
el
=
document
.
getElementById
(
'
js-groups-tree
'
);
// Don't do anything if element doesn't exist (No groups)
// Don't do anything if element doesn't exist (No groups)
...
@@ -71,4 +71,4 @@ document.addEventListener('DOMContentLoaded', () => {
...
@@ -71,4 +71,4 @@ document.addEventListener('DOMContentLoaded', () => {
});
});
},
},
});
});
}
)
;
};
app/assets/javascripts/pages/dashboard/groups/index/index.js
0 → 100644
View file @
bba9e727
import
initGroupsList
from
'
../../../../groups
'
;
export
default
()
=>
{
initGroupsList
();
};
app/assets/javascripts/pages/explore/groups/index.js
View file @
bba9e727
import
GroupsList
from
'
~/groups_list
'
;
import
GroupsList
from
'
~/groups_list
'
;
import
Landing
from
'
~/landing
'
;
import
Landing
from
'
~/landing
'
;
import
initGroupsList
from
'
../../../groups
'
;
export
default
function
()
{
export
default
function
()
{
new
GroupsList
();
// eslint-disable-line no-new
new
GroupsList
();
// eslint-disable-line no-new
initGroupsList
();
const
landingElement
=
document
.
querySelector
(
'
.js-explore-groups-landing
'
);
const
landingElement
=
document
.
querySelector
(
'
.js-explore-groups-landing
'
);
if
(
!
landingElement
)
return
;
if
(
!
landingElement
)
return
;
const
exploreGroupsLanding
=
new
Landing
(
const
exploreGroupsLanding
=
new
Landing
(
...
...
app/assets/javascripts/pages/groups/show/index.js
View file @
bba9e727
...
@@ -5,6 +5,7 @@ import notificationsDropdown from '~/notifications_dropdown';
...
@@ -5,6 +5,7 @@ import notificationsDropdown from '~/notifications_dropdown';
import
NotificationsForm
from
'
~/notifications_form
'
;
import
NotificationsForm
from
'
~/notifications_form
'
;
import
ProjectsList
from
'
~/projects_list
'
;
import
ProjectsList
from
'
~/projects_list
'
;
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
ShortcutsNavigation
from
'
~/shortcuts_navigation
'
;
import
initGroupsList
from
'
../../../groups
'
;
export
default
()
=>
{
export
default
()
=>
{
const
newGroupChildWrapper
=
document
.
querySelector
(
'
.js-new-project-subgroup
'
);
const
newGroupChildWrapper
=
document
.
querySelector
(
'
.js-new-project-subgroup
'
);
...
@@ -16,4 +17,6 @@ export default () => {
...
@@ -16,4 +17,6 @@ export default () => {
if
(
newGroupChildWrapper
)
{
if
(
newGroupChildWrapper
)
{
new
NewGroupChild
(
newGroupChildWrapper
);
new
NewGroupChild
(
newGroupChildWrapper
);
}
}
initGroupsList
();
};
};
app/views/dashboard/groups/_groups.html.haml
View file @
bba9e727
.js-groups-list-holder
.js-groups-list-holder
#js-groups-tree
{
data:
{
hide_projects:
'true'
,
endpoint:
dashboard_groups_path
(
format: :json
),
path:
dashboard_groups_path
,
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
#js-groups-tree
{
data:
{
hide_projects:
'true'
,
endpoint:
dashboard_groups_path
(
format: :json
),
path:
dashboard_groups_path
,
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
.loading-container.text-center
=
icon
(
'spinner spin 2x'
,
class:
'loading-animation prepend-top-20'
)
app/views/dashboard/groups/index.html.haml
View file @
bba9e727
...
@@ -3,9 +3,6 @@
...
@@ -3,9 +3,6 @@
-
header_title
"Groups"
,
dashboard_groups_path
-
header_title
"Groups"
,
dashboard_groups_path
=
render
'dashboard/groups_head'
=
render
'dashboard/groups_head'
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'groups'
-
if
params
[
:filter
].
blank?
&&
@groups
.
empty?
-
if
params
[
:filter
].
blank?
&&
@groups
.
empty?
=
render
'shared/groups/empty_state'
=
render
'shared/groups/empty_state'
-
else
-
else
...
...
app/views/explore/groups/_groups.html.haml
View file @
bba9e727
.js-groups-list-holder
.js-groups-list-holder
#js-groups-tree
{
data:
{
hide_projects:
'true'
,
endpoint:
explore_groups_path
(
format: :json
),
path:
explore_groups_path
,
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
#js-groups-tree
{
data:
{
hide_projects:
'true'
,
endpoint:
explore_groups_path
(
format: :json
),
path:
explore_groups_path
,
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
.loading-container.text-center
=
icon
(
'spinner spin 2x'
,
class:
'loading-animation prepend-top-20'
)
app/views/explore/groups/index.html.haml
View file @
bba9e727
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
-
page_title
"Groups"
-
page_title
"Groups"
-
header_title
"Groups"
,
dashboard_groups_path
-
header_title
"Groups"
,
dashboard_groups_path
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'groups'
-
if
current_user
-
if
current_user
=
render
'dashboard/groups_head'
=
render
'dashboard/groups_head'
-
else
-
else
...
...
app/views/groups/_children.html.haml
View file @
bba9e727
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'groups'
.js-groups-list-holder
.js-groups-list-holder
#js-groups-tree
{
data:
{
hide_projects:
'false'
,
group_id:
group
.
id
,
endpoint:
group_children_path
(
group
,
format: :json
),
path:
group_path
(
group
),
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
#js-groups-tree
{
data:
{
hide_projects:
'false'
,
group_id:
group
.
id
,
endpoint:
group_children_path
(
group
,
format: :json
),
path:
group_path
(
group
),
form_sel:
'form#group-filter-form'
,
filter_sel:
'.js-groups-list-filter'
,
holder_sel:
'.js-groups-list-holder'
,
dropdown_sel:
'.js-group-filter-dropdown-wrap'
}
}
.loading-container.text-center
=
icon
(
'spinner spin 2x'
,
class:
'loading-animation prepend-top-20'
)
config/webpack.config.js
View file @
bba9e727
...
@@ -44,9 +44,6 @@ var config = {
...
@@ -44,9 +44,6 @@ var config = {
graphs
:
'
./graphs/graphs_bundle.js
'
,
graphs
:
'
./graphs/graphs_bundle.js
'
,
graphs_charts
:
'
./graphs/graphs_charts.js
'
,
graphs_charts
:
'
./graphs/graphs_charts.js
'
,
graphs_show
:
'
./graphs/graphs_show.js
'
,
graphs_show
:
'
./graphs/graphs_show.js
'
,
group
:
'
./group.js
'
,
groups
:
'
./groups/index.js
'
,
groups_list
:
'
./groups_list.js
'
,
help
:
'
./help/help.js
'
,
help
:
'
./help/help.js
'
,
how_to_merge
:
'
./how_to_merge.js
'
,
how_to_merge
:
'
./how_to_merge.js
'
,
issue_show
:
'
./issue_show/index.js
'
,
issue_show
:
'
./issue_show/index.js
'
,
...
@@ -119,9 +116,9 @@ var config = {
...
@@ -119,9 +116,9 @@ var config = {
{
{
test
:
/
\_
worker
\.
js$/
,
test
:
/
\_
worker
\.
js$/
,
use
:
[
use
:
[
{
{
loader
:
'
worker-loader
'
,
loader
:
'
worker-loader
'
,
options
:
{
options
:
{
inline
:
true
inline
:
true
}
}
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment