Skip to content

Commit ee0ffa4

Browse files
authored
Merge pull request nextcloud#1328 from nextcloud/fix/small
2 parents 0f1f3b0 + 6e6cba4 commit ee0ffa4

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

cypress/e2e/tables-favorite.cy.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('Favorite tables/views', () => {
5050

5151
cy.get('[data-cy="navigationViewItem"]').first().as('testView')
5252

53-
cy.get('@testView').parent().parent().should('contain.text', 'Tutorial')
53+
cy.get('@testView').parent().parent().parent().should('contain.text', 'Tutorial')
5454
cy.get('@testView').find('[aria-haspopup="menu"]').click({ force: true })
5555

5656
cy.intercept({ method: 'POST', url: '**/ocs/v2.php/apps/tables/api/2/favorites/*/*' }).as('favoriteViewReq')
@@ -70,14 +70,14 @@ describe('Favorite tables/views', () => {
7070
cy.contains('Remove from favorites').click({ force: true })
7171
cy.wait('@unfavoriteViewReq').its('response.statusCode').should('equal', 200)
7272

73-
cy.get('@testView').parent().parent().should('contain.text', 'Tutorial')
73+
cy.get('@testView').parent().parent().parent().should('contain.text', 'Tutorial')
7474
})
7575

7676
it('can (un)favorite views with favorited parent tables', () => {
7777
cy.get('[data-cy="navigationViewItem"]').first().as('testView')
7878
cy.get('[data-cy="navigationTableItem"]').first().as('tutorialTable')
7979

80-
cy.get('@testView').parent().parent().should('contain.text', 'Tutorial')
80+
cy.get('@testView').parent().parent().parent().should('contain.text', 'Tutorial')
8181
cy.get('@testView').find('[aria-haspopup="menu"]').click({ force: true })
8282
cy.contains('Add to favorites').click({ force: true })
8383

src/modules/navigation/partials/NavigationTableItem.vue

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,12 @@
136136
{{ t('tables', 'Delete table') }}
137137
</NcActionButton>
138138
</template>
139-
<NavigationViewItem v-for="view in getViews"
140-
:key="'view'+view.id"
141-
:view="view"
142-
:show-share-sender="false" />
139+
<div>
140+
<NavigationViewItem v-for="view in getViews"
141+
:key="'view'+view.id"
142+
:view="view"
143+
:show-share-sender="false" />
144+
</div>
143145
</NcAppNavigationItem>
144146
</template>
145147

src/shared/components/ncTable/sections/CustomTable.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
</table>
3939
<div v-if="totalPages > 1" class="pagination-footer" :class="{'large-width': !appNavCollapsed || isMobile}">
4040
<div class="pagination-items">
41-
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber <= 1" @click="pageNumber = 1">
41+
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber <= 1" :aria-label="t('tables', 'Go to first page')" @click="pageNumber = 1">
4242
<template #icon>
4343
<PageFirstIcon :size="20" />
4444
</template>
4545
</NcButton>
46-
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber <= 1" @click="pageNumber--">
46+
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber <= 1" :aria-label="t('tables', 'Go to previous page')" @click="pageNumber--">
4747
<template #icon>
4848
<ChevronLeftIcon :size="20" />
4949
</template>
@@ -57,12 +57,12 @@
5757
</template>
5858
</NcSelect>
5959
</div>
60-
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber >= totalPages" @click="pageNumber++">
60+
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber >= totalPages" :aria-label="t('tables', 'Go to next page')" @click="pageNumber++">
6161
<template #icon>
6262
<ChevronRightIcon :size="20" />
6363
</template>
6464
</NcButton>
65-
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber >= totalPages" @click="pageNumber = totalPages">
65+
<NcButton type="tertiary" :disabled="totalPages === 1 || pageNumber >= totalPages" :aria-label="t('tables', 'Go to last page')" @click="pageNumber = totalPages">
6666
<template #icon>
6767
<PageLastIcon :size="20" />
6868
</template>

src/shared/utils/displayError.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function statusMessage(status) {
3737
* @param {string} msg as message to toast out
3838
*/
3939
function displaySimpleError(e = null, msg = '') {
40-
console.error('Error occurred: ' + msg ?? '', e?.message)
40+
console.error('Error occurred: ' + (msg ?? ''), e?.message)
4141
showError(msg)
4242
}
4343

0 commit comments

Comments
 (0)