Skip to content

Commit bd53003

Browse files
committed
Revert "Enhance useDataViewPagination with URL persisting"
1 parent 6976f91 commit bd53003

File tree

13 files changed

+900
-316
lines changed

13 files changed

+900
-316
lines changed

.github/workflows/check-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
pull_request:
44
branches:
55
- main
6-
- v5
6+
- v4
77
jobs:
88
call-build-lint-test-workflow:
99
uses: ./.github/workflows/build-lint-test.yml

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
push:
44
branches:
55
- main
6-
- v5
6+
- v4
77
jobs:
88
call-build-lint-test-workflow:
99
uses: ./.github/workflows/build-lint-test.yml

package-lock.json

Lines changed: 758 additions & 132 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/module/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
},
2828
"homepage": "https://github.com/patternfly/react-data-view#readme",
2929
"publishConfig": {
30-
"access": "public"
30+
"access": "public",
31+
"tag": "prerelease"
3132
},
3233
"dependencies": {
3334
"@patternfly/react-core": "6.0.0-alpha.94",

packages/module/patternfly-docs/content/extensions/data-view/examples/Functionality/Functionality.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { DataView } from '@patternfly/react-data-view/dist/dynamic/DataView';
1919
import { BulkSelect, BulkSelectValue } from '@patternfly/react-component-groups/dist/dynamic/BulkSelect';
2020
import { DataViewToolbar } from '@patternfly/react-data-view/dist/dynamic/DataViewToolbar';
2121
import { DataViewTable } from '@patternfly/react-data-view/dist/dynamic/DataViewTable';
22-
import { BrowserRouter, useSearchParams } from 'react-router-dom';
22+
2323

2424
This is a list of functionality you can use to manage data displayed in the **data view**.
2525

packages/module/patternfly-docs/content/extensions/data-view/examples/Layout/AbstractLayoutExample.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@ import DataView from '@patternfly/react-data-view/dist/dynamic/DataView';
44
const layoutItemStyling = {
55
width: '100%',
66
height: '5rem',
7-
padding: 'var(--pf-v5-global--spacer--md)',
8-
borderStyle: 'dashed',
9-
borderWidth: '2px',
7+
padding: 'var(--pf-t--global--spacer--md)',
8+
border: 'var(--pf-t--global--border--width--box--default) dashed var(--pf-t--global--border--color--default)'
109
};
1110

1211
export const BasicExample: React.FunctionComponent = () => (
1312
<DataView>
1413
<div style={layoutItemStyling}>Header</div>
15-
<div style={{ ...layoutItemStyling, borderTopWidth: 0, borderBottomWidth: 0 }}>Data representation</div>
14+
<div style={layoutItemStyling}>Data representation</div>
1615
<div style={layoutItemStyling}>Footer</div>
1716
</DataView>
1817
)

packages/module/patternfly-docs/generated/extensions/data-view/about-data-view/extensions.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ pageData.examples = {
2323

2424
const Component = () => (
2525
<React.Fragment>
26-
<p {...{"className":"ws-p"}}>
26+
<p {...{"className":"pf-v6-c-content--p ws-p "}}>
2727
{`Data view lives in its own package `}
28-
<PatternflyThemeLink {...{"to":"https://www.npmjs.com/package/@patternfly/react-data-view"}}>
29-
<code {...{"className":"ws-code"}}>
28+
<PatternflyThemeLink {...{"to":"https://www.npmjs.com/package/@patternfly/react-data-view","className":""}}>
29+
<code {...{"className":"ws-code "}}>
3030
{`@patternfly/react-data-view`}
3131
</code>
3232
</PatternflyThemeLink>
3333
</p>
34-
<AutoLinkHeader {...{"id":"data-view","size":"h1","className":"ws-title ws-h1"}}>
34+
<AutoLinkHeader {...{"id":"data-view","headingLevel":"h1","className":"ws-title ws-h1"}}>
3535
{`Data view`}
3636
</AutoLinkHeader>
37-
<p {...{"className":"ws-p"}}>
37+
<p {...{"className":"pf-v6-c-content--p ws-p "}}>
3838
{`The data view extension contains implementation of the data view component allowing to display record data in a configured layout.`}
3939
</p>
40-
<p {...{"className":"ws-p"}}>
40+
<p {...{"className":"pf-v6-c-content--p ws-p "}}>
4141
{`If you notice a bug or have a suggestion for the data view, feel free to file an issue in our `}
42-
<PatternflyThemeLink {...{"to":"https://github.com/patternfly/react-data-view/issues"}}>
42+
<PatternflyThemeLink {...{"to":"https://github.com/patternfly/react-data-view/issues","className":""}}>
4343
{`GitHub repository`}
4444
</PatternflyThemeLink>
4545
{`! Please make sure to check if there is already a pre-existing issue before creating a new issue.`}

packages/module/patternfly-docs/pages/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const centerStyle = {
1010

1111
const IndexPage = () => {
1212
return (
13-
<PageSection variant="light" style={centerStyle}>
13+
<PageSection style={centerStyle}>
1414
<div style={{ flex: 'none', textAlign: 'center' }}>
1515
<Title size="4xl" headingLevel="h1">
1616
My extension docs

packages/module/release.config.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
module.exports = {
2-
branches: [
3-
'do-not-delete',
4-
{ name: 'main', channel: 'prerelease', prerelease: 'prerelease' }
5-
],
2+
branches: [ 'do-not-delete', { name: 'main', channel: 'prerelease', prerelease: 'prerelease' } ],
63
analyzeCommits: {
74
preset: 'angular'
85
},

packages/module/src/DataView/DataView.test.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ import DataView from './DataView';
55
const layoutItemStyling = {
66
width: '100%',
77
height: '5rem',
8-
padding: 'var(--pf-v5-global--spacer--md)',
9-
borderStyle: 'dashed',
10-
borderWidth: '2px',
8+
padding: 'var(--pf-t--global--spacer--md)',
9+
border: 'var(--pf-t--global--border--width--box--default) dashed var(--pf-t--global--border--color--default)'
1110
};
1211

1312
describe('DataView component', () => {
1413
test('should render correctly', () => {
1514
expect(render(
1615
<DataView>
1716
<div style={layoutItemStyling}>Header</div>
18-
<div style={{ ...layoutItemStyling, borderTopWidth: 0, borderBottomWidth: 0 }}>Data representation</div>
17+
<div style={layoutItemStyling}>Data representation</div>
1918
<div style={layoutItemStyling}>Footer</div>
2019
</DataView>)).toMatchSnapshot();
2120
});

0 commit comments

Comments
 (0)