Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump commons-ui to 0.67.0 #113

Merged
merged 2 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@gridsuite/commons-ui": "0.64.6",
"@gridsuite/commons-ui": "0.67.0",
"@hookform/resolvers": "^3.3.4",
"@mui/icons-material": "^5.15.14",
"@mui/lab": "5.0.0-alpha.169",
Expand All @@ -21,6 +21,7 @@
"react-dom": "^18.2.0",
"react-hook-form": "^7.51.2",
"react-intl": "^6.6.4",
"react-querybuilder": "^7.2.0",
"react-redux": "^9.1.0",
"react-router-dom": "^6.22.3",
"react-scripts": "^5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/containers/FilterContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from '../redux/slices/Mapping';
import Filter from '../components/3-organisms/Filter';
import PropTypes from 'prop-types';
import { CustomFormProvider, EXPERT_FILTER_QUERY, yup } from '@gridsuite/commons-ui';
import { CustomFormProvider, EXPERT_FILTER_QUERY, yupConfig as yup } from '@gridsuite/commons-ui';
import useDataForm from '../hooks/react-hook-form/form/useDataForm';

// we do not need detail schema with all validation test for rqb filter
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/react-hook-form/form/useDataForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import { FieldErrors, FieldValues, useForm } from 'react-hook-form';
import { yupResolver } from '@hookform/resolvers/yup';
import useFormInit from './useFormInit';
import { yup } from '@gridsuite/commons-ui';
import { yupConfig as yup } from '@gridsuite/commons-ui';
import useDataUpdate from './useDataUpdate';

const useDataForm = (
Expand Down
40 changes: 20 additions & 20 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,35 +21,35 @@ import messages_en from './translations/en.json';
import messages_fr from './translations/fr.json';

import {
card_error_boundary_en,
card_error_boundary_fr,
cardErrorBoundaryEn,
cardErrorBoundaryFr,
CardErrorBoundary,
filter_en,
filter_expert_en,
filter_expert_fr,
filter_fr,
login_en,
login_fr,
top_bar_en,
top_bar_fr,
filterEn,
filterExpertEn,
filterExpertFr,
filterFr,
loginEn,
loginFr,
topBarEn,
topBarFr,
} from '@gridsuite/commons-ui';

const messages = {
en: {
...messages_en,
...login_en,
...top_bar_en,
...card_error_boundary_en,
...filter_en,
...filter_expert_en,
...loginEn,
...topBarEn,
...cardErrorBoundaryEn,
...filterEn,
...filterExpertEn,
},
fr: {
...messages_fr,
...login_fr,
...top_bar_fr,
...card_error_boundary_fr,
...filter_fr,
...filter_expert_fr,
...loginFr,
...topBarFr,
...cardErrorBoundaryFr,
...filterFr,
...filterExpertFr,
},
};

Expand Down
4 changes: 2 additions & 2 deletions src/redux/slices/Mapping.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { formatQuery } from 'react-querybuilder';
import { createAsyncThunk, createSelector, createSlice } from '@reduxjs/toolkit';
import * as mappingsAPI from '../../rest/mappingsAPI';
import * as _ from 'lodash';
Expand All @@ -14,11 +15,10 @@ import { AutomatonFamily } from '../../constants/automatonDefinition';
import { RuleEquipmentTypes } from '../../constants/equipmentType';
import {
exportExpertRules,
formatQuery,
getExpertFilterEmptyFormData,
importExpertRules,
rqbQuerySchemaValidator,
yup,
yupConfig as yup,
} from '@gridsuite/commons-ui';
import { v4 as uuid4 } from 'uuid';
import { enrichIdRqbQuery } from '../../utils/rqb-utils';
Expand Down
2 changes: 1 addition & 1 deletion src/redux/slices/User.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import { createSlice, PayloadAction, SliceCaseReducers } from '@reduxjs/toolkit';
import {
AuthenticationRouterErrorAction,
AuthenticationRouterErrorState,
CommonStoreState,
LOGOUT_ERROR,
Expand All @@ -23,7 +24,6 @@ import {
UserAction,
UserValidationErrorAction,
} from '@gridsuite/commons-ui';
import { AuthenticationRouterErrorAction } from '@gridsuite/commons-ui/dist/redux/authActions';

export type UserState = CommonStoreState & {
signInCallbackError: Error | null;
Expand Down
Loading