From 1308dc5eb484ab0f8064989fc551ebdb4b1a7976 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 13 Feb 2020 12:08:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../explorer/components/group_empty_state.vue | 39 +++ .../explorer/components/project_empty_state.vue | 113 +++++++ .../registry/explorer/pages/details.vue | 329 ++++++++++++++++++++- .../javascripts/registry/explorer/pages/list.vue | 211 ++++++++++++- .../registry/explorer/stores/actions.js | 4 +- .../registry/explorer/stores/mutations.js | 1 + 6 files changed, 691 insertions(+), 6 deletions(-) create mode 100644 app/assets/javascripts/registry/explorer/components/group_empty_state.vue create mode 100644 app/assets/javascripts/registry/explorer/components/project_empty_state.vue (limited to 'app/assets/javascripts/registry') diff --git a/app/assets/javascripts/registry/explorer/components/group_empty_state.vue b/app/assets/javascripts/registry/explorer/components/group_empty_state.vue new file mode 100644 index 00000000000..a29a9bd23c3 --- /dev/null +++ b/app/assets/javascripts/registry/explorer/components/group_empty_state.vue @@ -0,0 +1,39 @@ + + diff --git a/app/assets/javascripts/registry/explorer/components/project_empty_state.vue b/app/assets/javascripts/registry/explorer/components/project_empty_state.vue new file mode 100644 index 00000000000..53853b4b9fb --- /dev/null +++ b/app/assets/javascripts/registry/explorer/components/project_empty_state.vue @@ -0,0 +1,113 @@ + + diff --git a/app/assets/javascripts/registry/explorer/pages/details.vue b/app/assets/javascripts/registry/explorer/pages/details.vue index 6d32ba41eae..bff67bb8376 100644 --- a/app/assets/javascripts/registry/explorer/pages/details.vue +++ b/app/assets/javascripts/registry/explorer/pages/details.vue @@ -1,7 +1,332 @@ diff --git a/app/assets/javascripts/registry/explorer/pages/list.vue b/app/assets/javascripts/registry/explorer/pages/list.vue index 6d32ba41eae..dc730ac2828 100644 --- a/app/assets/javascripts/registry/explorer/pages/list.vue +++ b/app/assets/javascripts/registry/explorer/pages/list.vue @@ -1,7 +1,214 @@ diff --git a/app/assets/javascripts/registry/explorer/stores/actions.js b/app/assets/javascripts/registry/explorer/stores/actions.js index 7c06a12a5fc..25ff105ac53 100644 --- a/app/assets/javascripts/registry/explorer/stores/actions.js +++ b/app/assets/javascripts/registry/explorer/stores/actions.js @@ -45,11 +45,11 @@ export const requestImagesList = ({ commit, dispatch, state }, pagination = {}) export const requestTagsList = ({ commit, dispatch }, { pagination = {}, id }) => { commit(types.SET_MAIN_LOADING, true); - const url = window.atob(id); + const { tags_path } = JSON.parse(window.atob(id)); const { page = DEFAULT_PAGE, perPage = DEFAULT_PAGE_SIZE } = pagination; return axios - .get(url, { params: { page, per_page: perPage } }) + .get(tags_path, { params: { page, per_page: perPage } }) .then(({ data, headers }) => { dispatch('receiveTagsListSuccess', { data, headers }); }) diff --git a/app/assets/javascripts/registry/explorer/stores/mutations.js b/app/assets/javascripts/registry/explorer/stores/mutations.js index 186f36a759a..a2c6a11de20 100644 --- a/app/assets/javascripts/registry/explorer/stores/mutations.js +++ b/app/assets/javascripts/registry/explorer/stores/mutations.js @@ -5,6 +5,7 @@ export default { [types.SET_INITIAL_STATE](state, config) { state.config = { ...config, + isGroupPage: config.isGroupPage !== undefined, }; }, -- cgit v1.2.1