diff --git a/.github/workflows/changeset.yml b/.github/workflows/changeset.yml index 09b4fdbdf5..3f15ff70b0 100644 --- a/.github/workflows/changeset.yml +++ b/.github/workflows/changeset.yml @@ -23,7 +23,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repo - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: # This makes Actions fetch all Git history so that Changesets can generate changelogs with the correct commits fetch-depth: 0 diff --git a/.github/workflows/clean-demo.yml b/.github/workflows/clean-demo.yml index 3bde9b211e..7c778393e8 100644 --- a/.github/workflows/clean-demo.yml +++ b/.github/workflows/clean-demo.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout demo branch - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: path: demo ref: gh-pages diff --git a/.github/workflows/demo.yml b/.github/workflows/demo.yml index bbc06885ed..ab97573abc 100644 --- a/.github/workflows/demo.yml +++ b/.github/workflows/demo.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 - name: Use Node.js uses: ./.github/actions/setup-node @@ -39,7 +39,7 @@ jobs: run: yarn test:demo - name: Checkout demo branch - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: path: demo ref: gh-pages diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml index 7a9d737b82..8b19dc86ef 100644 --- a/.github/workflows/dependencies.yml +++ b/.github/workflows/dependencies.yml @@ -20,7 +20,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 - name: Use Node.js uses: ./.github/actions/setup-node diff --git a/.github/workflows/icons.yml b/.github/workflows/icons.yml index 6d1ec0bc89..351b5ec57a 100644 --- a/.github/workflows/icons.yml +++ b/.github/workflows/icons.yml @@ -19,7 +19,7 @@ jobs: working-directory: ./packages/icons steps: - name: Checkout sources - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: # Required when using a PAT for opening the PR persist-credentials: false diff --git a/.github/workflows/pr-demo.yml b/.github/workflows/pr-demo.yml index b4e8e9fc08..6692d18292 100644 --- a/.github/workflows/pr-demo.yml +++ b/.github/workflows/pr-demo.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 - name: Use Node.js uses: ./.github/actions/setup-node @@ -36,7 +36,7 @@ jobs: run: yarn test:demo - name: Checkout demo branch - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: path: demo ref: gh-pages diff --git a/.github/workflows/pr-lint.yml b/.github/workflows/pr-lint.yml index 4f9a46e5f9..ebf9312648 100644 --- a/.github/workflows/pr-lint.yml +++ b/.github/workflows/pr-lint.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token fetch-depth: 0 # otherwise, you will failed to push refs to dest repo diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index c3b0922029..be38cbd63d 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 - name: Use Node.js uses: ./.github/actions/setup-node diff --git a/.github/workflows/visual-testing.yml b/.github/workflows/visual-testing.yml index 7d030d669d..80ef4a47a3 100644 --- a/.github/workflows/visual-testing.yml +++ b/.github/workflows/visual-testing.yml @@ -28,7 +28,7 @@ jobs: environment: pull_request_unsafe if: ( github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'need visual approval') ) steps: - - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: fetch-depth: 0 diff --git a/.github/workflows/yarn-deduplicate.yml b/.github/workflows/yarn-deduplicate.yml index 80e36afb28..8838559bc9 100644 --- a/.github/workflows/yarn-deduplicate.yml +++ b/.github/workflows/yarn-deduplicate.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout sources - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1 with: persist-credentials: false # otherwise, the token used is the GITHUB_TOKEN, instead of your personal token fetch-depth: 0 # otherwise, you will failed to push refs to dest repo diff --git a/packages/components/src/List/ListComposition/ItemsNumber/ItemsNumber.component.jsx b/packages/components/src/List/ListComposition/ItemsNumber/ItemsNumber.component.jsx index a9f8160036..c16fb7f152 100644 --- a/packages/components/src/List/ListComposition/ItemsNumber/ItemsNumber.component.jsx +++ b/packages/components/src/List/ListComposition/ItemsNumber/ItemsNumber.component.jsx @@ -8,18 +8,18 @@ function ItemsNumber(props) {
{selected ? labelSelected || - t('LIST_TOOLBAR_NUMBER_OF_SELECTED_ITEMS', { + t('LIST_TOOLBAR_NUMBER_OF_SELECTED_ITEMS', { defaultValue: '{{count}}/{{total}} item', defaultValue_other: '{{count}}/{{total}} items', count: selected, total: totalItems, - }) + }) : label || - t('LIST_TOOLBAR_TOTAL_NUMBER_OF_ITEMS', { + t('LIST_TOOLBAR_TOTAL_NUMBER_OF_ITEMS', { defaultValue: '{{count}} item', defaultValue_other: '{{count}} items', count: totalItems, - })} + })}
); } diff --git a/packages/components/src/List/Toolbar/ColumnChooserButton/ColumnChooser/ColumnChooserRow/RowCheckbox/RowCheckbox.component.jsx b/packages/components/src/List/Toolbar/ColumnChooserButton/ColumnChooser/ColumnChooserRow/RowCheckbox/RowCheckbox.component.jsx index 1dbea63156..55aba2c7c3 100644 --- a/packages/components/src/List/Toolbar/ColumnChooserButton/ColumnChooser/ColumnChooserRow/RowCheckbox/RowCheckbox.component.jsx +++ b/packages/components/src/List/Toolbar/ColumnChooserButton/ColumnChooser/ColumnChooserRow/RowCheckbox/RowCheckbox.component.jsx @@ -21,7 +21,7 @@ const RowCheckbox = ({ const describedby = `${id}-${description}`; return locked ? ( - + ) : ( diff --git a/packages/components/src/List/Toolbar/ItemsNumber/ItemsNumber.component.jsx b/packages/components/src/List/Toolbar/ItemsNumber/ItemsNumber.component.jsx index 25674d46e3..256943aed1 100644 --- a/packages/components/src/List/Toolbar/ItemsNumber/ItemsNumber.component.jsx +++ b/packages/components/src/List/Toolbar/ItemsNumber/ItemsNumber.component.jsx @@ -6,18 +6,18 @@ function ItemsNumber({ id, totalItems, selected, label, labelSelected, t }) {
{selected ? labelSelected || - t('LIST_TOOLBAR_NUMBER_OF_SELECTED_ITEMS', { + t('LIST_TOOLBAR_NUMBER_OF_SELECTED_ITEMS', { defaultValue: '{{count}}/{{total}} item', defaultValue_other: '{{count}}/{{total}} items', count: selected, total: totalItems, - }) + }) : label || - t('LIST_TOOLBAR_TOTAL_NUMBER_OF_ITEMS', { + t('LIST_TOOLBAR_TOTAL_NUMBER_OF_ITEMS', { defaultValue: '{{count}} item', defaultValue_other: '{{count}} items', count: totalItems, - })} + })}
); } diff --git a/packages/components/src/ResourceList/ResourceList.test.jsx b/packages/components/src/ResourceList/ResourceList.test.jsx index 2190fd951e..674d82d0a2 100644 --- a/packages/components/src/ResourceList/ResourceList.test.jsx +++ b/packages/components/src/ResourceList/ResourceList.test.jsx @@ -6,32 +6,31 @@ import ResourceList from './ResourceList.component'; jest.mock( '../VirtualizedList', () => - ({ rowHeight, collection, inProgress, type, onRowClick, noRowsRenderer, rowRenderers }) => - ( -
-
- {rowRenderers.resource({ - index: 0, - parent: { - props: { - rowHeight, - collection, - inProgress, - type, - rowGetter: index => collection[index], - }, + ({ rowHeight, collection, inProgress, type, onRowClick, noRowsRenderer, rowRenderers }) => ( +
+
+ {rowRenderers.resource({ + index: 0, + parent: { + props: { + rowHeight, + collection, + inProgress, + type, + rowGetter: index => collection[index], }, - })} -
- {collection.length === 0 &&
{noRowsRenderer()}
} - + }, + })}
- ), + {collection.length === 0 &&
{noRowsRenderer()}
} + +
+ ), ); const collection = [ diff --git a/packages/components/src/VirtualizedList/utils/tablerow.jsx b/packages/components/src/VirtualizedList/utils/tablerow.jsx index e4d719021f..250849fb37 100644 --- a/packages/components/src/VirtualizedList/utils/tablerow.jsx +++ b/packages/components/src/VirtualizedList/utils/tablerow.jsx @@ -81,7 +81,7 @@ export function toColumns({ id, theme, children, columnsWidths, getRowState }) { ...field.props.columnData, getRowState, id, - }, + }, ...createColumnWidthProps(columnWidth), }; return ;