From 6bd9b227aadf43676caa5d7a790db881b3c16dec Mon Sep 17 00:00:00 2001 From: James Tattersall <10601770+jamerst@users.noreply.github.com> Date: Sun, 13 Feb 2022 17:12:48 +0000 Subject: [PATCH] Fix o-data-grid-pro package --- packages/o-data-grid-pro/src/ODataGridPro.tsx | 2 +- packages/o-data-grid-pro/src/index.ts | 4 +- packages/package.json | 1 + packages/pnpm-lock.yaml | 56 +++++++++++++++++++ 4 files changed, 60 insertions(+), 3 deletions(-) diff --git a/packages/o-data-grid-pro/src/ODataGridPro.tsx b/packages/o-data-grid-pro/src/ODataGridPro.tsx index 0b8a966..22612b3 100644 --- a/packages/o-data-grid-pro/src/ODataGridPro.tsx +++ b/packages/o-data-grid-pro/src/ODataGridPro.tsx @@ -1,5 +1,5 @@ import React from "react" -import { ODataGridProProps } from "ODataGridProProps" +import { ODataGridProProps } from "./ODataGridProProps" import ODataGridBase from "../../base/components/ODataGridBase" import { DataGridPro } from "@mui/x-data-grid-pro" diff --git a/packages/o-data-grid-pro/src/index.ts b/packages/o-data-grid-pro/src/index.ts index 2658943..49604f1 100644 --- a/packages/o-data-grid-pro/src/index.ts +++ b/packages/o-data-grid-pro/src/index.ts @@ -1,6 +1,6 @@ import { GridColDef } from "@mui/x-data-grid-pro"; -import ODataGridPro from "ODataGridPro"; +import ODataGridPro from "./ODataGridPro"; import { ODataGridBaseColDef } from "../../base/types"; import FilterBuilder from "../../base/FilterBuilder/components/FilterBuilder"; import { allOperators, numericOperators } from "../../base/FilterBuilder/constants"; @@ -12,7 +12,7 @@ export { numericOperators } -export type { ODataGridProProps } from "ODataGridProProps" +export type { ODataGridProProps } from "./ODataGridProProps" export type ODataGridColDef = ODataGridBaseColDef export type { SelectOption, ValueOption, ODataColumnVisibilityModel } from "../../base/types"; diff --git a/packages/package.json b/packages/package.json index 2a84e38..234910e 100644 --- a/packages/package.json +++ b/packages/package.json @@ -15,6 +15,7 @@ "@mui/material": "^5.2.8", "@mui/system": "^5.2.8", "@mui/x-data-grid": "^5.4.0", + "@mui/x-data-grid-pro": "^5.5.1", "@types/ramda": "^0.27.62", "@types/react": "^17.0.38", "@types/react-dom": "^17.0.11", diff --git a/packages/pnpm-lock.yaml b/packages/pnpm-lock.yaml index f94d6ca..5cdda1a 100644 --- a/packages/pnpm-lock.yaml +++ b/packages/pnpm-lock.yaml @@ -10,6 +10,7 @@ specifiers: '@mui/material': ^5.2.8 '@mui/system': ^5.2.8 '@mui/x-data-grid': ^5.4.0 + '@mui/x-data-grid-pro': ^5.5.1 '@types/ramda': ^0.27.62 '@types/react': ^17.0.38 '@types/react-dom': ^17.0.11 @@ -50,6 +51,7 @@ devDependencies: '@mui/material': 5.4.1_6226f8758b5b21b5515ad844c1caeb22 '@mui/system': 5.4.1_2af1fda251a25a998cef61bdffa74edc '@mui/x-data-grid': 5.5.0_cb47c7e14db85098d561483455a0b6a1 + '@mui/x-data-grid-pro': 5.5.1_cb47c7e14db85098d561483455a0b6a1 '@types/ramda': 0.27.64 '@types/react': 17.0.39 '@types/react-dom': 17.0.11 @@ -554,6 +556,24 @@ packages: react-is: 17.0.2 dev: true + /@mui/x-data-grid-pro/5.5.1_cb47c7e14db85098d561483455a0b6a1: + resolution: {integrity: sha512-Fh5zWvu6Mz135uIAH7he64Zx4AWCp+ztgsc5EHISd457Mcc4rWJqpSVE6bMOo4tfNT32NFPoApJqc/LFK/33ng==} + engines: {node: '>=12.0.0'} + peerDependencies: + '@mui/material': ^5.2.8 + '@mui/system': ^5.2.8 + react: ^17.0.2 + dependencies: + '@mui/material': 5.4.1_6226f8758b5b21b5515ad844c1caeb22 + '@mui/system': 5.4.1_2af1fda251a25a998cef61bdffa74edc + '@mui/utils': 5.4.1_react@17.0.2 + '@mui/x-license-pro': 5.5.1_react@17.0.2 + clsx: 1.1.1 + prop-types: 15.8.1 + react: 17.0.2 + reselect: 4.1.5 + dev: true + /@mui/x-data-grid/5.5.0_cb47c7e14db85098d561483455a0b6a1: resolution: {integrity: sha512-qjOAqUHDsQ1elZuvL05k6bQITI2bbCRFrYYk03Y8mz7PpbSn1KrHlMVwJQbZByl/+uWO0Md1my/UUfaVWy9Puw==} engines: {node: '>=12.0.0'} @@ -571,6 +591,19 @@ packages: reselect: 4.1.5 dev: true + /@mui/x-license-pro/5.5.1_react@17.0.2: + resolution: {integrity: sha512-GPx9u9vceYwLZWbpgItVAtBFAruwGkeOKV7fPz1oGMQo7nF5yKbJAycLzFG6gAh7dxjzSi3w5Vg561QeV1TKFQ==} + engines: {node: '>=12.0.0'} + hasBin: true + peerDependencies: + react: ^17.0.2 + dependencies: + '@mui/utils': 5.4.1_react@17.0.2 + esm: 3.2.25 + react: 17.0.2 + yargs: 17.3.1 + dev: true + /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -2002,6 +2035,11 @@ packages: - supports-color dev: true + /esm/3.2.25: + resolution: {integrity: sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==} + engines: {node: '>=6'} + dev: true + /espree/9.3.0: resolution: {integrity: sha512-d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -4607,6 +4645,11 @@ packages: engines: {node: '>=10'} dev: true + /yargs-parser/21.0.0: + resolution: {integrity: sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==} + engines: {node: '>=12'} + dev: true + /yargs/16.2.0: resolution: {integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==} engines: {node: '>=10'} @@ -4620,6 +4663,19 @@ packages: yargs-parser: 20.2.9 dev: true + /yargs/17.3.1: + resolution: {integrity: sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==} + engines: {node: '>=12'} + dependencies: + cliui: 7.0.4 + escalade: 3.1.1 + get-caller-file: 2.0.5 + require-directory: 2.1.1 + string-width: 4.2.3 + y18n: 5.0.8 + yargs-parser: 21.0.0 + dev: true + /yocto-queue/0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} engines: {node: '>=10'}