Commit 5fd44155 authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'vue-repo-document-title' into 'master'

Update document title when repository router changes

See merge request gitlab-org/gitlab-ce!28714
parents 4fe81054 ecf54c23
...@@ -2,10 +2,12 @@ import Vue from 'vue'; ...@@ -2,10 +2,12 @@ import Vue from 'vue';
import createRouter from './router'; import createRouter from './router';
import App from './components/app.vue'; import App from './components/app.vue';
import apolloProvider from './graphql'; import apolloProvider from './graphql';
import { setTitle } from './utils/title';
export default function setupVueRepositoryList() { export default function setupVueRepositoryList() {
const el = document.getElementById('js-tree-list'); const el = document.getElementById('js-tree-list');
const { projectPath, ref } = el.dataset; const { projectPath, ref, fullName } = el.dataset;
const router = createRouter(projectPath, ref);
apolloProvider.clients.defaultClient.cache.writeData({ apolloProvider.clients.defaultClient.cache.writeData({
data: { data: {
...@@ -14,9 +16,11 @@ export default function setupVueRepositoryList() { ...@@ -14,9 +16,11 @@ export default function setupVueRepositoryList() {
}, },
}); });
router.afterEach(({ params: { pathMatch } }) => setTitle(pathMatch, ref, fullName));
return new Vue({ return new Vue({
el, el,
router: createRouter(projectPath, ref), router,
apolloProvider, apolloProvider,
render(h) { render(h) {
return h(App); return h(App);
......
// eslint-disable-next-line import/prefer-default-export
export const setTitle = (pathMatch, ref, project) => {
const path = pathMatch.replace(/^\//, '');
const isEmpty = path === '';
document.title = `${isEmpty ? 'Files' : path} · ${ref} · ${project}`;
};
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
= render 'stat_anchor_list', anchors: @project.statistics_buttons(show_auto_devops_callout: show_auto_devops_callout) = render 'stat_anchor_list', anchors: @project.statistics_buttons(show_auto_devops_callout: show_auto_devops_callout)
- if vue_file_list - if vue_file_list
#js-tree-list{ data: { project_path: @project.full_path, ref: ref } } #js-tree-list{ data: { project_path: @project.full_path, full_name: @project.name_with_namespace, ref: ref } }
- if @tree.readme - if @tree.readme
= render "projects/tree/readme", readme: @tree.readme = render "projects/tree/readme", readme: @tree.readme
- else - else
......
import { setTitle } from '~/repository/utils/title';
describe('setTitle', () => {
it.each`
path | title
${'/'} | ${'Files'}
${'app'} | ${'app'}
${'app/assets'} | ${'app/assets'}
${'app/assets/javascripts'} | ${'app/assets/javascripts'}
`('sets document title as $title for $path', ({ path, title }) => {
setTitle(path, 'master', 'GitLab');
expect(document.title).toEqual(`${title} · master · GitLab`);
});
});
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