Skip to content

Make sure that navigation link is correct #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
underscope merged 3 commits into from
Mar 9, 2021
Merged

Make sure that navigation link is correct #770

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
016efaf
Make sure that navigation link is correct
zcuric Mar 9, 2021
32bc277
Refactor getTabItems function
zcuric Mar 9, 2021
6986023
Remove exact to match all use cases
zcuric Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions client/components/repository/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
:key="tab.name"
:to="{ name: tab.route, query: tab.query }"
active-class="tab-active"
ripple exact
ripple
class="px-4">
<v-icon class="pr-2">mdi-{{ tab.icon }}</v-icon>{{ tab.name }}
</v-tab>
Expand All @@ -34,6 +34,29 @@ import selectActivity from '@/components/repository/common/selectActivity';
import sortBy from 'lodash/sortBy';
import withUserTracking from 'components/common/mixins/userTracking';

const getTabItems = ({ hasWorkflow, hasSettingsAvailable, hasActivities, query }) => [
{
name: 'Structure',
route: 'repository',
icon: 'file-tree'
},
hasActivities && hasWorkflow && {
name: 'Progress',
route: 'progress',
icon: 'chart-timeline-variant'
},
hasActivities && {
name: 'History',
route: 'revisions',
icon: 'history'
},
hasSettingsAvailable && {
name: 'Settings',
route: 'repository-info',
icon: 'settings-outline'
}
].filter(Boolean).map(tab => ({ ...tab, query }));

export default {
mixins: [selectActivity, withUserTracking],
props: {
Expand All @@ -53,26 +76,12 @@ export default {
return this.getActiveUsers('repository', this.repositoryId);
},
tabs() {
const { isAdmin, isRepositoryAdmin, hasWorkflow } = this;
const hasSettingsAvailable = isAdmin || isRepositoryAdmin;
const hasActivities = get(this.activities, 'length');
const activityId = get(this.lastSelectedActivity, 'id');
const query = { ...this.$route.query, activityId };
const items = [
{ name: 'Structure', route: 'repository', icon: 'file-tree' },
hasActivities && this.hasWorkflow && {
name: 'Progress',
route: 'progress',
icon: 'chart-timeline-variant'
},
hasActivities && { name: 'History', route: 'revisions', icon: 'history' },
(this.isAdmin || this.isRepositoryAdmin) && {
name: 'Settings',
route: 'repository-info',
icon: 'settings-outline'
}
];
return items
.filter(Boolean)
.map(tab => ({ ...tab, query }));
const query = { ...this.$route.query, ...activityId && { activityId } };
return getTabItems({ hasSettingsAvailable, hasWorkflow, hasActivities, query });
}
},
methods: mapActions('repository', ['initialize', 'expandParents']),
Expand Down