Skip to content

Commit

Permalink
[8.x] [VisLibrary] AnnotGroup listing page papercuts (#205914) (#206283)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `8.x`:
- [[VisLibrary] AnnotGroup listing page papercuts
(#205914)](#205914)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Paulina
Shakirova","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-01-10T13:38:00Z","message":"[VisLibrary]
AnnotGroup listing page papercuts (#205914)\n\n## Summary\nThis PR fixes
[Annotation groups Listing
Page\nPapercuts](#198731)
and\n[Dashboard Listing
Page\nPapercuts](#198728)
issues.\n\n1. Changed the name of the first column\n2. Fixed edit icon
being invisible while editing functionality is\navailable.\nIn the past
the logic was different - hiding of icon was happening based\non
`isEditable(item)` property, and in the [[Managed content] readonly\nin
library\nviews](https://github.com/elastic/kibana/pull/176263/files#diff-e442682471f1021a9126ddcad7e00a0d334e57ac8db512c1c3268e14ecac0074L552)\nPR
the logic was changed to depend on adding a key `{ edit: {
enabled:\nfalse }` if there is a need to hide the Edit button. What
happened is\nthat the logic should be -> If you don't want to show the
Edit icon, add\n`{ edit: { enabled: false }`, but in the current code,
although there is\nno such key, the pencil stays invisible, because
the\n`Boolean(tableItemsRowActions[item.id]?.edit?.enabled)` resolved
to\n`false` when it is `undefined` (when the Edit functionality
isn't\ndisabled.) In this PR I propose an adjustment to this line of
code.\n3. Changed the View Details icon.\n4. Show Reload page toast when
a user changes preferred\n`savedObjects:perPage` in Advanced
Settings.\n5. Fix sorting algorithm that was sorting incorrectly if the
preferred\n`savedObjects:perPage` was less than 10.\n\n<img
width=\"237\" alt=\"Screenshot 2025-01-09 at 13 44
39\"\nsrc=\"https://github.com/user-attachments/assets/77a6fd45-8845-4b06-818c-0af0dc01ede9\"\n/>\n\n<img
width=\"243\" alt=\"Screenshot 2025-01-09 at 13 43
30\"\nsrc=\"https://github.com/user-attachments/assets/3d9e03da-94dd-4e31-b33a-eb81e71b69dd\"\n/>","sha":"86e8a2fceeb24c83f52d421c18600811ac028ef4","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:fix","v9.0.0","Team:SharedUX","backport:prev-minor","papercut"],"title":"[VisLibrary]
AnnotGroup listing page
papercuts","number":205914,"url":"https://github.com/elastic/kibana/pull/205914","mergeCommit":{"message":"[VisLibrary]
AnnotGroup listing page papercuts (#205914)\n\n## Summary\nThis PR fixes
[Annotation groups Listing
Page\nPapercuts](#198731)
and\n[Dashboard Listing
Page\nPapercuts](#198728)
issues.\n\n1. Changed the name of the first column\n2. Fixed edit icon
being invisible while editing functionality is\navailable.\nIn the past
the logic was different - hiding of icon was happening based\non
`isEditable(item)` property, and in the [[Managed content] readonly\nin
library\nviews](https://github.com/elastic/kibana/pull/176263/files#diff-e442682471f1021a9126ddcad7e00a0d334e57ac8db512c1c3268e14ecac0074L552)\nPR
the logic was changed to depend on adding a key `{ edit: {
enabled:\nfalse }` if there is a need to hide the Edit button. What
happened is\nthat the logic should be -> If you don't want to show the
Edit icon, add\n`{ edit: { enabled: false }`, but in the current code,
although there is\nno such key, the pencil stays invisible, because
the\n`Boolean(tableItemsRowActions[item.id]?.edit?.enabled)` resolved
to\n`false` when it is `undefined` (when the Edit functionality
isn't\ndisabled.) In this PR I propose an adjustment to this line of
code.\n3. Changed the View Details icon.\n4. Show Reload page toast when
a user changes preferred\n`savedObjects:perPage` in Advanced
Settings.\n5. Fix sorting algorithm that was sorting incorrectly if the
preferred\n`savedObjects:perPage` was less than 10.\n\n<img
width=\"237\" alt=\"Screenshot 2025-01-09 at 13 44
39\"\nsrc=\"https://github.com/user-attachments/assets/77a6fd45-8845-4b06-818c-0af0dc01ede9\"\n/>\n\n<img
width=\"243\" alt=\"Screenshot 2025-01-09 at 13 43
30\"\nsrc=\"https://github.com/user-attachments/assets/3d9e03da-94dd-4e31-b33a-eb81e71b69dd\"\n/>","sha":"86e8a2fceeb24c83f52d421c18600811ac028ef4"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/205914","number":205914,"mergeCommit":{"message":"[VisLibrary]
AnnotGroup listing page papercuts (#205914)\n\n## Summary\nThis PR fixes
[Annotation groups Listing
Page\nPapercuts](#198731)
and\n[Dashboard Listing
Page\nPapercuts](#198728)
issues.\n\n1. Changed the name of the first column\n2. Fixed edit icon
being invisible while editing functionality is\navailable.\nIn the past
the logic was different - hiding of icon was happening based\non
`isEditable(item)` property, and in the [[Managed content] readonly\nin
library\nviews](https://github.com/elastic/kibana/pull/176263/files#diff-e442682471f1021a9126ddcad7e00a0d334e57ac8db512c1c3268e14ecac0074L552)\nPR
the logic was changed to depend on adding a key `{ edit: {
enabled:\nfalse }` if there is a need to hide the Edit button. What
happened is\nthat the logic should be -> If you don't want to show the
Edit icon, add\n`{ edit: { enabled: false }`, but in the current code,
although there is\nno such key, the pencil stays invisible, because
the\n`Boolean(tableItemsRowActions[item.id]?.edit?.enabled)` resolved
to\n`false` when it is `undefined` (when the Edit functionality
isn't\ndisabled.) In this PR I propose an adjustment to this line of
code.\n3. Changed the View Details icon.\n4. Show Reload page toast when
a user changes preferred\n`savedObjects:perPage` in Advanced
Settings.\n5. Fix sorting algorithm that was sorting incorrectly if the
preferred\n`savedObjects:perPage` was less than 10.\n\n<img
width=\"237\" alt=\"Screenshot 2025-01-09 at 13 44
39\"\nsrc=\"https://github.com/user-attachments/assets/77a6fd45-8845-4b06-818c-0af0dc01ede9\"\n/>\n\n<img
width=\"243\" alt=\"Screenshot 2025-01-09 at 13 43
30\"\nsrc=\"https://github.com/user-attachments/assets/3d9e03da-94dd-4e31-b33a-eb81e71b69dd\"\n/>","sha":"86e8a2fceeb24c83f52d421c18600811ac028ef4"}}]}]
BACKPORT-->

Co-authored-by: Paulina Shakirova <[email protected]>
  • Loading branch information
kibanamachine and paulinashakirova authored Jan 10, 2025
1 parent 037207e commit ac4699b
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ const urlStateSerializer = (updated: {
const tableColumnMetadata = {
title: {
field: 'attributes.title',
name: 'Name, description, tags',
name: 'Name',
},
updatedAt: {
field: 'updatedAt',
Expand Down Expand Up @@ -421,7 +421,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
pageIndex: 0,
totalItemCount: 0,
pageSize: initialPageSize,
pageSizeOptions: uniq([10, 20, 50, initialPageSize]).sort(),
pageSizeOptions: uniq([10, 20, 50, initialPageSize]).sort((a, b) => Number(a) - Number(b)),
},
tableSort: initialSort.tableSort,
sortColumnChanged: !initialSort.isDefault,
Expand Down Expand Up @@ -606,7 +606,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
name:
titleColumnName ??
i18n.translate('contentManagement.tableList.mainColumnName', {
defaultMessage: 'Name, description, tags',
defaultMessage: 'Name',
}),
sortable: true,
render: (field: keyof T, record: T) => {
Expand Down Expand Up @@ -696,7 +696,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
),
icon: 'pencil',
type: 'icon',
available: (item) => Boolean(tableItemsRowActions[item.id]?.edit?.enabled),
available: (item) => tableItemsRowActions[item.id]?.edit?.enabled !== false,
enabled: (v) => !(v as unknown as { error: string })?.error,
onClick: editItem,
'data-test-subj': `edit-action`,
Expand All @@ -722,7 +722,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
defaultMessage: 'View details',
}
),
icon: 'iInCircle',
icon: 'controlsVertical',
type: 'icon',
onClick: inspectItem,
'data-test-subj': `inspect-action`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export const uiSettings: Record<string, UiSettingsParams> = {
description: i18n.translate('savedObjectsFinder.advancedSettings.perPageText', {
defaultMessage: 'Number of objects to show per page in the load dialog',
}),
requiresPageReload: true,
schema: schema.number(),
},
[LISTING_LIMIT_SETTING]: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,6 @@
"contentManagement.tableList.listing.userFilter.errorMessage": "Échec de chargement des utilisateurs",
"contentManagement.tableList.listing.userFilter.filterLabel": "Créé par",
"contentManagement.tableList.listing.userFilter.noCreators": "Aucun créateur",
"contentManagement.tableList.mainColumnName": "Nom, description, balises",
"contentManagement.tableList.managedItemNoEdit": "Elastic gère cet objet. Clonez-le pour effectuer des modifications.",
"contentManagement.tableList.tabsFilter.allTabLabel": "Tous",
"contentManagement.tableList.tabsFilter.favoriteTabLabel": "Éléments avec étoiles",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,6 @@
"contentManagement.tableList.listing.userFilter.errorMessage": "ユーザーの読み込みに失敗しました",
"contentManagement.tableList.listing.userFilter.filterLabel": "作成者",
"contentManagement.tableList.listing.userFilter.noCreators": "作成担当なし",
"contentManagement.tableList.mainColumnName": "名前、説明、タグ",
"contentManagement.tableList.managedItemNoEdit": "Elasticはこの項目を管理します。変更するには、複製してください。",
"contentManagement.tableList.tabsFilter.allTabLabel": "すべて",
"contentManagement.tableList.tabsFilter.favoriteTabLabel": "スター付き",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,6 @@
"contentManagement.tableList.listing.userFilter.errorMessage": "无法加载用户",
"contentManagement.tableList.listing.userFilter.filterLabel": "创建者",
"contentManagement.tableList.listing.userFilter.noCreators": "无创建者",
"contentManagement.tableList.mainColumnName": "名称、描述、标签",
"contentManagement.tableList.managedItemNoEdit": "Elastic 将管理此项目。进行克隆以做出更改。",
"contentManagement.tableList.tabsFilter.allTabLabel": "全部",
"contentManagement.tableList.tabsFilter.favoriteTabLabel": "带星标",
Expand Down

0 comments on commit ac4699b

Please sign in to comment.