Skip to content

Commit

Permalink
add docs link on the main menu (#68)
Browse files Browse the repository at this point in the history
* add docs link on the main menu

* <bot> update dependencies*.log files(s)

* fix tests

---------

Co-authored-by: github-actions <[email protected]>
  • Loading branch information
dsschult and github-actions authored Oct 31, 2023
1 parent 0123ebb commit 6d0e7c1
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion cypress/integration/groups.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ context('Groups Page', () => {
})

cy.get('#nav .active').contains('groups', {matchCase: false})
cy.get('#nav li').should('have.length', 2)
cy.get('#nav li').should('have.length', 3)

cy.get('[data-test="administered-groups"]').contains('groupA', {matchCase: false})
cy.get('[data-test="administered-groups"]').within(() => {
Expand Down
1 change: 1 addition & 0 deletions cypress/integration/home.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ context('Home Page', () => {

cy.get('#nav .active').contains('home', {matchCase: false})
cy.get('#nav li').contains('institutions', {matchCase: false}).should('not.exist')
cy.get('#nav li').contains('docs', {matchCase: false})

cy.get('.account .login-link').should('contain', 'Sign in')

Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/insts.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ context('Institutions Page', () => {
})

cy.get('#nav .active').contains('institutions', {matchCase: false})
cy.get('#nav li').should('have.length', 2)
cy.get('#nav li').should('have.length', 3)

cy.get('.approvals [data-test="userC"]').should('exist')
cy.get('.approvals [data-test="approve"]').should('exist').click()
Expand Down
4 changes: 2 additions & 2 deletions dependencies-from-Dockerfile.log
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
aio-pika==9.3.0
aiormq==6.7.7
cachetools==5.3.1
cachetools==5.3.2
certifi==2023.7.22
cffi==1.16.0
charset-normalizer==3.3.1
Expand All @@ -24,7 +24,7 @@ typing_extensions==4.8.0
Unidecode==1.3.7
urllib3==2.0.7
-e /app
wipac-dev-tools==1.7.0
wipac-dev-tools==1.7.1
wipac-keycloak-rest-services==1.4.45
wipac-rest-tools==1.6.0
yarl==1.9.2
7 changes: 6 additions & 1 deletion user_mgmt/static/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,11 @@ Vue.component('navpage', {
this.current = to.params.route
next()
},
template: '<li :class="classObj"><router-link :to="path">{{ name }}</router-link></li>'
template: `
<li :class="classObj">
<a v-if="path.startsWith('http')" :href="path">{{ name }}</a>
<router-link v-else :to="path">{{ name }}</router-link>
</li>`
});

Vue.component('account', {
Expand Down Expand Up @@ -208,6 +212,7 @@ export default async function vue_startup(keycloak){
{ path: '/groups', name: 'Groups', component: Groups,
props: {keycloak: keycloak}, meta: { requiresAuth: true, requiresGroupAdmin: true }
},
{ path: 'https://docs.icecube.aq/Madison-account/user-workflow/', name: 'Docs' },
{ path: '*', name: '404', component: Error404, props: true }
];

Expand Down

0 comments on commit 6d0e7c1

Please sign in to comment.