@portnet/ui 0.1.15 → 0.1.16

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -105,7 +105,7 @@ const PuiSpecificReferentielField = _ref2 => {
105
105
  getRenderedValue,
106
106
  onChange,
107
107
  onError,
108
- fetchDataFunction
108
+ dataFilterFunction
109
109
  } = _ref2;
110
110
  const {
111
111
  token,
@@ -117,13 +117,14 @@ const PuiSpecificReferentielField = _ref2 => {
117
117
  const [filtreredFilters, setFiltreredFilters] = React.useState([..._specificReferentielsBaseFilters.default[searchKey]]);
118
118
  const formRef = React.useRef();
119
119
  const [isMounted, setIsMounted] = React.useState(false);
120
+ const [filteredData, setFilteredData] = React.useState([]);
120
121
  const pageChangeHandler = pageNumber => {
121
122
  dataFetchingDispatch({
122
123
  type: "SET_PAGE",
123
124
  payload: pageNumber
124
125
  });
125
126
  };
126
- const defaultSubmitHandler = async values => {
127
+ const submitHandler = async values => {
127
128
  try {
128
129
  dataFetchingDispatch({
129
130
  type: "GET_DATA"
@@ -153,38 +154,14 @@ const PuiSpecificReferentielField = _ref2 => {
153
154
  onError(error);
154
155
  }
155
156
  };
156
- const submitHandler = async (values, formikBag) => {
157
- // Check if dataFetchingDispatch is not null and a custom submit handler function is provided
158
- if (dataFetchingDispatch && fetchDataFunction) {
159
- try {
160
- dataFetchingDispatch({
161
- type: "GET_DATA"
162
- });
163
- const data = await fetchDataFunction(searchKey, specifications, dataFetchingState.pageNumber, dataFetchingState.pageSize, values);
164
- if (data.success) {
165
- dataFetchingDispatch({
166
- type: "SUCCESSED",
167
- payload: {
168
- data: data.results,
169
- totalElements: data.totalElements
170
- }
171
- });
172
- } else {
173
- throw new Error(data.message);
174
- }
175
- } catch (error) {
176
- dataFetchingDispatch({
177
- type: "FAILED",
178
- payload: error.message
179
- });
180
- if (onError) {
181
- onError(error);
182
- }
183
- }
157
+ React.useEffect(() => {
158
+ if (dataFilterFunction) {
159
+ const newFilteredData = dataFilterFunction(dataFetchingState.data);
160
+ setFilteredData(newFilteredData);
184
161
  } else {
185
- return defaultSubmitHandler(values, formikBag);
162
+ setFilteredData(dataFetchingState.data);
186
163
  }
187
- };
164
+ }, [dataFetchingState.data, dataFilterFunction]);
188
165
  React.useEffect(() => {
189
166
  if (isMounted) {
190
167
  var _formRef$current;
@@ -207,7 +184,7 @@ const PuiSpecificReferentielField = _ref2 => {
207
184
  formik: formik,
208
185
  loading: dataFetchingState.isLoading,
209
186
  rowCount: dataFetchingState.totalElements,
210
- rows: dataFetchingState.data,
187
+ rows: filteredData,
211
188
  page: dataFetchingState.pageNumber,
212
189
  pageSize: dataFetchingState.pageSize,
213
190
  columns: Array.isArray(columns) && Boolean(columns.length) ? columns : _specificReferentielsBaseColumns.default[searchKey],
@@ -341,7 +318,7 @@ PuiSpecificReferentielField.propTypes = {
341
318
  getReturnedValue: _propTypes.default.func,
342
319
  onChange: _propTypes.default.func,
343
320
  onError: _propTypes.default.func,
344
- fetchDataFunction: _propTypes.default.func
321
+ dataFilterFunction: _propTypes.default.func
345
322
  };
346
323
  PuiSpecificReferentielField.defaultProps = {
347
324
  disabled: false,
@@ -355,6 +332,6 @@ PuiSpecificReferentielField.defaultProps = {
355
332
  getReturnedValue: row => row,
356
333
  onError: () => {},
357
334
  onChange: () => {},
358
- fetchDataFunction: null
335
+ dataFilterFunction: null
359
336
  };
360
337
  var _default = exports.default = PuiSpecificReferentielField;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@portnet/ui",
3
- "version": "0.1.15",
3
+ "version": "0.1.16",
4
4
  "description": "Portnet UI",
5
5
  "keywords": [
6
6
  "react",