Skip to content

Commit

Permalink
Backport 1.20 (#2300)
Browse files Browse the repository at this point in the history
OKTA-753914 fix: english leak for "Close" in Autocomplete (#2291)

OKTA-742653 English leak for "Close" in Autocomplete
feat: pageTemplate and Layout component (#2219)

OKTA-721245 feat: start layout component
feat: more work on layout component
feat: documentation and syntax updates
fix: update to storybook and component
feat: add more to Storybook
fix: remove unncessary MUI ScopedCssBaseline
feat: add full-width story
feat(odyssey-react-mui): create surface component
feat(odyssey-react-mui): create stories for Grid
feat(odyssey-react-mui): remove surface styling from Grid
fix: small nit fixes
feat(odyssey-react-mui): panes => regions
fix(odyssey-react-mui): rename components and add disclaimer
fix: standardize vertical layout distance
refactor: update css
refactor: alphabetize the imports
feat: add rudimentary responsiveness to Layout
refactor: improve nested selectors
refactor: update based on code review
Merge branch 'main' into ti-OKTA-721245-layout-component
fix: update redundant type export
fix: data Table legacy improvements (#2294)

OKTA-753577 feat: add max pages and max rows per page to pagination
feat: add manual pagination next disabling
feat: reset pagination if search or filters changes
refactor: alphabetize props
feat: fixing pagination bug
refactor: improve pagination calculation
refactor: update currentRowsCount to be non-breaking
chore(odyssey-react-mui): fix Layout story margin
chore(odyssey-react-mui): bump to 1.20.0. not done in main by error
chore: back to 1.19.0
chore: bump back to 1.20.0 and generate changelog
Merge branch 'main' into bc_backport_1.20
Merge remote-tracking branch 'origin/main' into bc_backport_1.20
  • Loading branch information
bryancunningham-okta authored Jul 31, 2024
1 parent f08e789 commit 5444c92
Show file tree
Hide file tree
Showing 17 changed files with 160 additions and 78 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

### Features

- pageTemplate and Layout component ([#2219](https://github.com/okta/odyssey/issues/2219)) ([a04eb1d](https://github.com/okta/odyssey/commit/a04eb1df24702ef23b436d0df58e0571974b0454))

### Bug Fixes

- data Table legacy improvements ([#2294](https://github.com/okta/odyssey/issues/2294)) ([3146cd1](https://github.com/okta/odyssey/commit/3146cd1edeb145aa727682659eaba422533ba0f1))
- english leak for "Close" in Autocomplete ([#2291](https://github.com/okta/odyssey/issues/2291)) ([0959c71](https://github.com/okta/odyssey/commit/0959c71f7c2dc6ddc1cde3281534f19222f4df6d))

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

### Features
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"npmClient": "yarn",
"packages": ["packages/*"],
"useNx": false,
"version": "1.19.0"
"version": "1.20.0"
}
4 changes: 4 additions & 0 deletions packages/browserslist-config-odyssey/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

**Note:** Version bump only for package @okta/browserslist-config-odyssey

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/browserslist-config-odyssey
Expand Down
2 changes: 1 addition & 1 deletion packages/browserslist-config-odyssey/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/browserslist-config-odyssey",
"version": "1.19.0",
"version": "1.20.0",
"description": "Browserslist config for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-babel-loader/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

**Note:** Version bump only for package @okta/odyssey-babel-loader

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-babel-loader
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-loader/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-babel-loader",
"version": "1.19.0",
"version": "1.20.0",
"description": "Babel webpack loader for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-babel-preset/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

**Note:** Version bump only for package @okta/odyssey-babel-preset

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-babel-preset
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-babel-preset/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-babel-preset",
"version": "1.19.0",
"version": "1.20.0",
"description": "Babel preset for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-design-tokens/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

**Note:** Version bump only for package @okta/odyssey-design-tokens

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-design-tokens
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-design-tokens/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-design-tokens",
"version": "1.19.0",
"version": "1.20.0",
"description": "Design tokens for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/odyssey-react-mui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

### Features

- pageTemplate and Layout component ([#2219](https://github.com/okta/odyssey/issues/2219)) ([a04eb1d](https://github.com/okta/odyssey/commit/a04eb1df24702ef23b436d0df58e0571974b0454))

### Bug Fixes

- data Table legacy improvements ([#2294](https://github.com/okta/odyssey/issues/2294)) ([3146cd1](https://github.com/okta/odyssey/commit/3146cd1edeb145aa727682659eaba422533ba0f1))
- english leak for "Close" in Autocomplete ([#2291](https://github.com/okta/odyssey/issues/2291)) ([0959c71](https://github.com/okta/odyssey/commit/0959c71f7c2dc6ddc1cde3281534f19222f4df6d))

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

### Features
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-react-mui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-react-mui",
"version": "1.19.0",
"version": "1.20.0",
"description": "React MUI components for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
11 changes: 11 additions & 0 deletions packages/odyssey-storybook/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

### Features

- pageTemplate and Layout component ([#2219](https://github.com/okta/odyssey/issues/2219)) ([a04eb1d](https://github.com/okta/odyssey/commit/a04eb1df24702ef23b436d0df58e0571974b0454))

### Bug Fixes

- data Table legacy improvements ([#2294](https://github.com/okta/odyssey/issues/2294)) ([3146cd1](https://github.com/okta/odyssey/commit/3146cd1edeb145aa727682659eaba422533ba0f1))
- english leak for "Close" in Autocomplete ([#2291](https://github.com/okta/odyssey/issues/2291)) ([0959c71](https://github.com/okta/odyssey/commit/0959c71f7c2dc6ddc1cde3281534f19222f4df6d))

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

### Features
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-storybook/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-storybook",
"version": "1.19.0",
"version": "1.20.0",
"description": "Documentation for Odyssey, Okta's design system",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ const RegionDisclaimer = () => {
);
};

const MarginContainer = styled.div({
"& + &": {
marginBlockStart: "16px",
},
});

const storybookMeta: Meta<LayoutProps> = {
title: "Labs Components/Layout",
component: Layout,
Expand Down Expand Up @@ -250,76 +256,99 @@ export const KitchenSink: StoryObj<LayoutProps> = {
render: function () {
return (
<>
<Layout regions={[1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[2, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 2]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[3, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 3]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<Layout regions={[1, 1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
<MarginContainer>
<Layout regions={[1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[2, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 2]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[3, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 3]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>

<MarginContainer>
<Layout regions={[1, 1, 1, 1]}>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
<VisibleRegion>
<RegionLabel>Region</RegionLabel>
</VisibleRegion>
</Layout>
</MarginContainer>
</>
);
},
Expand Down
4 changes: 4 additions & 0 deletions packages/odyssey-svgr/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [1.20.0](https://github.com/okta/odyssey/compare/v1.19.0...v1.20.0) (2024-07-25)

**Note:** Version bump only for package @okta/odyssey-svgr

## [1.19.0](https://github.com/okta/odyssey/compare/v1.18.0...v1.19.0) (2024-07-15)

**Note:** Version bump only for package @okta/odyssey-svgr
Expand Down
2 changes: 1 addition & 1 deletion packages/odyssey-svgr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@okta/odyssey-svgr",
"version": "1.19.0",
"version": "1.20.0",
"description": "Configuration files for svgr icon conversion",
"author": "Okta, Inc.",
"license": "Apache-2.0",
Expand Down

0 comments on commit 5444c92

Please sign in to comment.