@gpa-gemstone/common-pages 0.0.170 → 0.0.172

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.
Files changed (2) hide show
  1. package/lib/SearchBar.js +31 -6
  2. package/package.json +7 -6
package/lib/SearchBar.js CHANGED
@@ -59,6 +59,7 @@ exports.DefaultSearch = void 0;
59
59
  var React = __importStar(require("react"));
60
60
  var react_interactive_1 = require("@gpa-gemstone/react-interactive");
61
61
  var react_redux_1 = require("react-redux");
62
+ var helper_functions_1 = require("@gpa-gemstone/helper-functions");
62
63
  /** This Implements a few standardized SearchBars */
63
64
  var DefaultSearch;
64
65
  (function (DefaultSearch) {
@@ -75,6 +76,7 @@ var DefaultSearch;
75
76
  ];
76
77
  var dispatch = (0, react_redux_1.useDispatch)();
77
78
  var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
79
+ var addlFilters = (0, helper_functions_1.useStringMemonization)(props.AddlFilters);
78
80
  var searchStatus = (0, react_redux_1.useSelector)(props.Slice.SearchStatus);
79
81
  var sortField = (0, react_redux_1.useSelector)(props.Slice.SortField);
80
82
  var ascending = (0, react_redux_1.useSelector)(props.Slice.Ascending);
@@ -82,13 +84,17 @@ var DefaultSearch;
82
84
  React.useEffect(function () {
83
85
  return props.GetAddlFields(setAddlFieldCols);
84
86
  }, []);
87
+ var setFilters = React.useCallback(function (filters) {
88
+ return dispatch(props.Slice.DBSearch({ filter: (addlFilters == null ? filters : __spreadArray(__spreadArray([], filters, true), addlFilters, true)), sortField: sortField, ascending: ascending }));
89
+ }, [sortField, ascending, addlFilters, props.Slice]);
85
90
  var standardSearch = { label: 'Name', key: 'Name', type: 'string', isPivotField: false };
86
- return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: function (flds) { return dispatch(props.Slice.DBSearch({ filter: (props.AddlFilters === undefined ? flds : __spreadArray(__spreadArray([], flds, true), props.AddlFilters, true)), sortField: sortField, ascending: ascending })); }, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Meter(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
91
+ return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: setFilters, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Meter(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
87
92
  };
88
93
  /** This Implements a standard Substation Search */
89
94
  DefaultSearch.Location = function (props) {
90
95
  var standardSearch = { label: 'Name', key: 'Name', type: 'string', isPivotField: false };
91
96
  var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
97
+ var addlFilters = (0, helper_functions_1.useStringMemonization)(props.AddlFilters);
92
98
  var dispatch = (0, react_redux_1.useDispatch)();
93
99
  var searchStatus = (0, react_redux_1.useSelector)(props.Slice.SearchStatus);
94
100
  var sortField = (0, react_redux_1.useSelector)(props.Slice.SortField);
@@ -106,12 +112,16 @@ var DefaultSearch;
106
112
  React.useEffect(function () {
107
113
  return props.GetAddlFields(setAddlFieldCols);
108
114
  }, []);
109
- return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: function (flds) { return dispatch(props.Slice.DBSearch({ filter: (props.AddlFilters === undefined ? flds : __spreadArray(__spreadArray([], flds, true), props.AddlFilters, true)), sortField: sortField, ascending: ascending })); }, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Substation(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
115
+ var setFilters = React.useCallback(function (filters) {
116
+ return dispatch(props.Slice.DBSearch({ filter: (addlFilters == null ? filters : __spreadArray(__spreadArray([], filters, true), addlFilters, true)), sortField: sortField, ascending: ascending }));
117
+ }, [sortField, ascending, addlFilters, props.Slice.DBSearch]);
118
+ return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: setFilters, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Substation(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
110
119
  };
111
120
  /** This Implements a standard Transmission Asset Search */
112
121
  DefaultSearch.Asset = function (props) {
113
122
  var standardSearch = { label: 'Name', key: 'AssetName', type: 'string', isPivotField: false };
114
123
  var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
124
+ var addlFilters = (0, helper_functions_1.useStringMemonization)(props.AddlFilters);
115
125
  var dispatch = (0, react_redux_1.useDispatch)();
116
126
  var searchStatus = (0, react_redux_1.useSelector)(props.Slice.SearchStatus);
117
127
  var sortField = (0, react_redux_1.useSelector)(props.Slice.SortField);
@@ -131,12 +141,16 @@ var DefaultSearch;
131
141
  React.useEffect(function () {
132
142
  return props.GetAddlFields(setAddlFieldCols);
133
143
  }, []);
134
- return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: function (flds) { return dispatch(props.Slice.DBSearch({ filter: (props.AddlFilters === undefined ? flds : __spreadArray(__spreadArray([], flds, true), props.AddlFilters, true)), sortField: sortField, ascending: ascending })); }, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Transmission Asset(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
144
+ var setFilters = React.useCallback(function (filters) {
145
+ return dispatch(props.Slice.DBSearch({ filter: (addlFilters == null ? filters : __spreadArray(__spreadArray([], filters, true), addlFilters, true)), sortField: sortField, ascending: ascending }));
146
+ }, [sortField, ascending, addlFilters, props.Slice]);
147
+ return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: setFilters, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Transmission Asset(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
135
148
  };
136
149
  /** This Implements a standard AssetGroup Search */
137
150
  DefaultSearch.AssetGroup = function (props) {
138
151
  var standardSearch = { label: 'Name', key: 'Name', type: 'string', isPivotField: false };
139
152
  var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
153
+ var addlFilters = (0, helper_functions_1.useStringMemonization)(props.AddlFilters);
140
154
  var dispatch = (0, react_redux_1.useDispatch)();
141
155
  var searchStatus = (0, react_redux_1.useSelector)(props.Slice.SearchStatus);
142
156
  var sortField = (0, react_redux_1.useSelector)(props.Slice.SortField);
@@ -153,12 +167,16 @@ var DefaultSearch;
153
167
  React.useEffect(function () {
154
168
  return props.GetAddlFields(setAddlFieldCols);
155
169
  }, []);
156
- return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: function (flds) { return dispatch(props.Slice.DBSearch({ filter: (props.AddlFilters === undefined ? flds : __spreadArray(__spreadArray([], flds, true), props.AddlFilters, true)), sortField: sortField, ascending: ascending })); }, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Asset Group(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
170
+ var setFilters = React.useCallback(function (filters) {
171
+ return dispatch(props.Slice.DBSearch({ filter: (addlFilters == null ? filters : __spreadArray(__spreadArray([], filters, true), addlFilters, true)), sortField: sortField, ascending: ascending }));
172
+ }, [sortField, ascending, addlFilters, props.Slice]);
173
+ return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: setFilters, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Asset Group(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
157
174
  };
158
175
  /** This Implements a standard User Search */
159
176
  DefaultSearch.User = function (props) {
160
177
  var standardSearch = { label: 'Username', key: 'Name', type: 'string', isPivotField: false };
161
178
  var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
179
+ var addlFilters = (0, helper_functions_1.useStringMemonization)(props.AddlFilters);
162
180
  var dispatch = (0, react_redux_1.useDispatch)();
163
181
  var searchStatus = (0, react_redux_1.useSelector)(props.Slice.SearchStatus);
164
182
  var sortField = (0, react_redux_1.useSelector)(props.Slice.SortField);
@@ -172,7 +190,10 @@ var DefaultSearch;
172
190
  React.useEffect(function () {
173
191
  return props.GetAddlFields(setAddlFieldCols);
174
192
  }, []);
175
- return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: function (flds) { return dispatch(props.Slice.DBSearch({ filter: (props.AddlFilters === undefined ? flds : __spreadArray(__spreadArray([], flds, true), props.AddlFilters, true)), sortField: sortField, ascending: ascending })); }, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' User(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
193
+ var setFilters = React.useCallback(function (filters) {
194
+ return dispatch(props.Slice.DBSearch({ filter: (addlFilters == null ? filters : __spreadArray(__spreadArray([], filters, true), addlFilters, true)), sortField: sortField, ascending: ascending }));
195
+ }, [sortField, ascending, addlFilters, props.Slice]);
196
+ return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: setFilters, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' User(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
176
197
  };
177
198
  /** This Implements a standard Customer Search */
178
199
  DefaultSearch.Customer = function (props) {
@@ -184,6 +205,7 @@ var DefaultSearch;
184
205
  ];
185
206
  var standardSearch = { label: 'Name', key: 'Name', type: 'string', isPivotField: false };
186
207
  var _a = React.useState([]), addlFieldCols = _a[0], setAddlFieldCols = _a[1];
208
+ var addlFilters = (0, helper_functions_1.useStringMemonization)(props.AddlFilters);
187
209
  var dispatch = (0, react_redux_1.useDispatch)();
188
210
  var searchStatus = (0, react_redux_1.useSelector)(props.Slice.SearchStatus);
189
211
  var sortField = (0, react_redux_1.useSelector)(props.Slice.SortField);
@@ -192,6 +214,9 @@ var DefaultSearch;
192
214
  React.useEffect(function () {
193
215
  return props.GetAddlFields(setAddlFieldCols);
194
216
  }, []);
195
- return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: function (flds) { return dispatch(props.Slice.DBSearch({ filter: (props.AddlFilters === undefined ? flds : __spreadArray(__spreadArray([], flds, true), props.AddlFilters, true)), sortField: sortField, ascending: ascending })); }, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Customer(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
217
+ var setFilters = React.useCallback(function (filters) {
218
+ return dispatch(props.Slice.DBSearch({ filter: (addlFilters == null ? filters : __spreadArray(__spreadArray([], filters, true), addlFilters, true)), sortField: sortField, ascending: ascending }));
219
+ }, [sortField, ascending, addlFilters, props.Slice]);
220
+ return React.createElement(react_interactive_1.SearchBar, { CollumnList: __spreadArray(__spreadArray([], defaultSearchcols, true), addlFieldCols, true), SetFilter: setFilters, Direction: 'left', defaultCollumn: standardSearch, Width: '50%', Label: 'Search', ShowLoading: searchStatus === 'loading', ResultNote: searchStatus === 'error' ? 'Could not complete Search' : 'Found ' + data.length + ' Customer(s)', GetEnum: props.GetEnum, StorageID: props.StorageID }, props.children);
196
221
  };
197
222
  })(DefaultSearch || (exports.DefaultSearch = DefaultSearch = {}));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gpa-gemstone/common-pages",
3
- "version": "0.0.170",
3
+ "version": "0.0.172",
4
4
  "description": "Common UI pages for GPA products",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -37,6 +37,7 @@
37
37
  "@types/jquery": "3.5.6",
38
38
  "@types/lodash": "4.14.171",
39
39
  "@types/react": "18.2.0",
40
+ "@types/styled-components": "5.1.11",
40
41
  "@typescript-eslint/eslint-plugin": "^5.60.0",
41
42
  "@typescript-eslint/parser": "^5.60.0",
42
43
  "eslint": "^8.43.0",
@@ -46,12 +47,12 @@
46
47
  "typescript": "5.5.3"
47
48
  },
48
49
  "dependencies": {
49
- "@gpa-gemstone/application-typings": "0.0.96",
50
+ "@gpa-gemstone/application-typings": "0.0.97",
50
51
  "@gpa-gemstone/gpa-symbols": "0.0.59",
51
- "@gpa-gemstone/helper-functions": "0.0.55",
52
- "@gpa-gemstone/react-forms": "1.1.115",
53
- "@gpa-gemstone/react-interactive": "1.0.179",
54
- "@gpa-gemstone/react-table": "1.2.103",
52
+ "@gpa-gemstone/helper-functions": "0.0.56",
53
+ "@gpa-gemstone/react-forms": "1.1.117",
54
+ "@gpa-gemstone/react-interactive": "1.0.181",
55
+ "@gpa-gemstone/react-table": "1.2.105",
55
56
  "@reduxjs/toolkit": "1.8.3",
56
57
  "crypto-js": "^4.2.0",
57
58
  "moment": "^2.29.4",