@gpa-gemstone/common-pages 0.0.125 → 0.0.127

Sign up to get free protection for your applications and to get access to all the features.
package/lib/BulkUpload.js CHANGED
@@ -74,7 +74,7 @@ function BulkUpload(props) {
74
74
  if (props.Step === 'Upload' || props.Step === 'Complete' || currentPipelineIndex == null || currentPipelineIndex > props.Pipelines.length - 1 || props.CurrentPipelineStep > ((_c = (_b = (_a = props.Pipelines) === null || _a === void 0 ? void 0 : _a[currentPipelineIndex]) === null || _b === void 0 ? void 0 : _b.Steps) === null || _c === void 0 ? void 0 : _c.length) - 1)
75
75
  return React.createElement(React.Fragment, null);
76
76
  var pipeline = props.Pipelines[currentPipelineIndex].Steps[props.CurrentPipelineStep];
77
- return React.createElement(pipeline.UI, { AdditionalProps: (_d = props.Pipelines[currentPipelineIndex].Steps[props.CurrentPipelineStep]) === null || _d === void 0 ? void 0 : _d.AdditionalProps, RawFileData: rawFileContent, SetData: setData, SetPipelineStep: props.SetCurrentPipelineStep, CurrentPipelineStep: props.CurrentPipelineStep, Errors: pipelineErrors, SetErrors: setPipelineErrors });
77
+ return React.createElement(pipeline.UI, { AdditionalProps: (_d = props.Pipelines[currentPipelineIndex].Steps[props.CurrentPipelineStep]) === null || _d === void 0 ? void 0 : _d.AdditionalProps, RawFileData: rawFileContent, SetData: setData, Data: data, SetPipelineStep: props.SetCurrentPipelineStep, CurrentPipelineStep: props.CurrentPipelineStep, Errors: pipelineErrors, SetErrors: setPipelineErrors });
78
78
  }, [props.Step, currentPipelineIndex, rawFileContent, props.CurrentPipelineStep, props.Pipelines]);
79
79
  var progressSteps = React.useMemo(function () {
80
80
  var _a, _b, _c;
@@ -2,6 +2,12 @@ import { Gemstone } from '@gpa-gemstone/application-typings';
2
2
  interface IAdditionalProps<T> {
3
3
  Fields: Gemstone.TSX.Interfaces.ICSVField<T>[];
4
4
  DataHasHeaders: boolean;
5
+ Headers: string[];
6
+ SetHeaders: (headers: string[]) => void;
7
+ Data: string[][];
8
+ SetData: (d: string[][]) => void;
9
+ HeaderMap: Map<string, keyof T | undefined>;
10
+ SetHeaderMap: (map: Map<string, keyof T | undefined>) => void;
5
11
  }
6
- export declare function useCSVPipeline<T = unknown>(csvFields: Gemstone.TSX.Interfaces.ICSVField<T>[]): Gemstone.TSX.Interfaces.IPipeline<T, IAdditionalProps<T>>;
12
+ export declare function useCSVPipeline<T = unknown, U extends IAdditionalProps<T> = IAdditionalProps<T>>(csvFields: Gemstone.TSX.Interfaces.ICSVField<T>[], additionalSteps?: Gemstone.TSX.Interfaces.IPipelineSteps<T, U>[]): Gemstone.TSX.Interfaces.IPipeline<T, IAdditionalProps<T>>;
7
13
  export {};
@@ -61,50 +61,68 @@ var react_interactive_1 = require("@gpa-gemstone/react-interactive");
61
61
  var react_forms_1 = require("@gpa-gemstone/react-forms");
62
62
  var react_table_1 = require("@gpa-gemstone/react-table");
63
63
  var gpa_symbols_1 = require("@gpa-gemstone/gpa-symbols");
64
- var react_table_2 = require("@gpa-gemstone/react-table");
65
64
  var lodash_1 = require("lodash");
66
65
  var AdditionalUploadUI = function (props) {
67
66
  return (React.createElement("div", { className: 'row justify-content-center m-0' },
68
67
  React.createElement("div", { className: 'col-6 p-0' },
69
68
  React.createElement(react_forms_1.CheckBox, { Record: { HasHeaders: props.HasHeaders }, Field: "HasHeaders", Setter: function (record) { return props.SetHasHeaders(record.HasHeaders); }, Label: 'My Data Has Headers' }))));
70
69
  };
71
- function useCSVPipeline(csvFields) {
70
+ function useCSVPipeline(csvFields, additionalSteps) {
72
71
  var _a = React.useState(false), hasHeaders = _a[0], setHasHeaders = _a[1];
72
+ //Define
73
+ var _b = React.useState([]), headers = _b[0], setHeaders = _b[1];
74
+ var _c = React.useState(new Map()), headerMap = _c[0], setHeaderMap = _c[1];
75
+ var _d = React.useState([]), data = _d[0], setData = _d[1];
76
+ var baseStep = {
77
+ Label: 'Edit CSV',
78
+ UI: CsvPipelineEditStep,
79
+ AdditionalProps: {
80
+ Fields: csvFields,
81
+ DataHasHeaders: hasHeaders,
82
+ Headers: headers,
83
+ SetHeaders: setHeaders,
84
+ Data: data,
85
+ SetData: setData,
86
+ HeaderMap: headerMap,
87
+ SetHeaderMap: setHeaderMap
88
+ }
89
+ };
90
+ var steps = additionalSteps == null ? [baseStep] : __spreadArray([baseStep], additionalSteps, true);
73
91
  return {
74
92
  Select: function (mimeType, fileExt) { return mimeType.toLowerCase() === 'text/csv' || fileExt === 'csv'; },
75
- Steps: [{ Label: 'Edit CSV', UI: CsvPipelineEditStep, AdditionalProps: { Fields: csvFields, DataHasHeaders: hasHeaders } }],
93
+ Steps: steps,
76
94
  AdditionalUploadUI: React.createElement(AdditionalUploadUI, { HasHeaders: hasHeaders, SetHasHeaders: setHasHeaders })
77
95
  };
78
96
  }
79
97
  function CsvPipelineEditStep(props) {
80
- var _a, _b, _c, _d;
98
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
81
99
  var rawDataRef = React.useRef();
82
- var _e = React.useState([]), headers = _e[0], setHeaders = _e[1];
83
- var _f = React.useState(new Map()), headerMap = _f[0], setHeaderMap = _f[1];
84
- var _g = React.useState([]), data = _g[0], setData = _g[1];
85
- var _h = React.useState([]), pagedData = _h[0], setPagedData = _h[1];
86
- var _j = React.useState(true), isFileParseable = _j[0], setIsFileParseable = _j[1];
87
- var _k = React.useState(false), isCSVMissingHeaders = _k[0], setIsCSVMissingHeaders = _k[1];
88
- var _l = React.useState(false), isCSVMissingDataCells = _l[0], setIsCSVMissingDataCells = _l[1];
89
- var _m = React.useState(0), page = _m[0], setPage = _m[1];
90
- var _o = React.useState(1), totalPages = _o[0], setTotalPages = _o[1];
91
- var _p = React.useState(true), showDataHeaderAlert = _p[0], setShowDataHeaderAlert = _p[1];
92
- var _q = React.useState(true), showDataOrHeaderAlert = _q[0], setShowDataOrHeaderAlert = _q[1];
100
+ var _z = React.useState([]), pagedData = _z[0], setPagedData = _z[1];
101
+ var _0 = React.useState(true), isFileParseable = _0[0], setIsFileParseable = _0[1];
102
+ var _1 = React.useState(false), isCSVMissingHeaders = _1[0], setIsCSVMissingHeaders = _1[1];
103
+ var _2 = React.useState(false), isCSVMissingDataCells = _2[0], setIsCSVMissingDataCells = _2[1];
104
+ var _3 = React.useState(0), page = _3[0], setPage = _3[1];
105
+ var _4 = React.useState(1), totalPages = _4[0], setTotalPages = _4[1];
106
+ var _5 = React.useState(true), showDataHeaderAlert = _5[0], setShowDataHeaderAlert = _5[1];
107
+ var _6 = React.useState(true), showDataOrHeaderAlert = _6[0], setShowDataOrHeaderAlert = _6[1];
93
108
  React.useEffect(function () {
94
- if (data.length === 0)
109
+ var _a, _b, _c, _d, _e;
110
+ if (((_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Data.length) === 0)
95
111
  return;
96
- var pages = Math.ceil(data.length / 10);
112
+ var pages = Math.ceil(((_c = (_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Data.length) !== null && _c !== void 0 ? _c : 0) / 10);
97
113
  setTotalPages(pages);
98
- var Data = __spreadArray([], data, true);
114
+ var Data = __spreadArray([], ((_e = (_d = props.AdditionalProps) === null || _d === void 0 ? void 0 : _d.Data) !== null && _e !== void 0 ? _e : []), true);
99
115
  setPagedData(Data.slice(page * 10, (page + 1) * 10));
100
- }, [data, page]);
116
+ }, [(_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Data, page]);
101
117
  React.useEffect(function () {
118
+ var _a;
102
119
  var errors = [];
103
120
  if (props.AdditionalProps == null)
104
121
  return;
122
+ var headerMap = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.HeaderMap;
105
123
  props.AdditionalProps.Fields.forEach(function (field) {
106
- var _a, _b;
107
- var matchedHeader = (_a = Array.from(headerMap.entries()).find(function (_a) {
124
+ var _a, _b, _c, _d, _e;
125
+ var matchedHeader = (_a = Array.from(headerMap).find(function (_a) {
108
126
  var value = _a[1];
109
127
  return value === field.Field;
110
128
  })) === null || _a === void 0 ? void 0 : _a[0];
@@ -113,13 +131,13 @@ function CsvPipelineEditStep(props) {
113
131
  errors.push("".concat(field.Label, " is required and must be mapped to a header."));
114
132
  return; // return early if the field was never mapped to a header
115
133
  }
116
- var fieldIndex = headers.indexOf(matchedHeader);
134
+ var fieldIndex = (_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Headers.indexOf(matchedHeader);
117
135
  var foundDuplicate = false;
118
136
  var foundEmpty = false;
119
137
  var foundInvalid = false;
120
138
  var uniqueValues = new Set();
121
139
  //Need to also make sure that all the fields that have the Required flag got mapped to a header...
122
- data.forEach(function (row) {
140
+ (_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.Data.forEach(function (row) {
123
141
  var value = row[fieldIndex + 1]; //+1 for row index value
124
142
  // Unique check
125
143
  if (field.Unique) {
@@ -138,53 +156,86 @@ function CsvPipelineEditStep(props) {
138
156
  if (field.Unique && foundDuplicate)
139
157
  errors.push("All ".concat(field.Label, " values must be unique."));
140
158
  if (foundEmpty)
141
- errors.push("All ".concat(field.Label, " cannot be empty."));
159
+ errors.push("All ".concat(field.Label, " values cannot be empty."));
142
160
  if (foundInvalid)
143
- errors.push("All ".concat(field.Label, " must contain valid values."));
161
+ errors.push("All ".concat(field.Label, " values must be valid."));
144
162
  //Check for SameValueForAllRows
145
- if ((_b = field.SameValueForAllRows) !== null && _b !== void 0 ? _b : false) {
146
- var allValues = data.map(function (row) { var _a; return (_a = row[fieldIndex + 1]) !== null && _a !== void 0 ? _a : ''; });
163
+ if ((_d = field.SameValueForAllRows) !== null && _d !== void 0 ? _d : false) {
164
+ var allValues = (_e = props.AdditionalProps) === null || _e === void 0 ? void 0 : _e.Data.map(function (row) { var _a; return (_a = row[fieldIndex + 1]) !== null && _a !== void 0 ? _a : ''; });
147
165
  if (new Set(allValues).size > 1)
148
- errors.push("All rows for ".concat(field.Label, " must contain the same value."));
166
+ errors.push("All rows must contain the same value for ".concat(field.Label, "."));
149
167
  }
150
168
  });
151
169
  if (!(0, lodash_1.isEqual)(props.Errors.sort(), errors.sort()))
152
170
  props.SetErrors(errors);
153
- }, [data, headers, headerMap, isFileParseable, (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Fields]);
171
+ }, [(_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Data, (_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.Headers, (_d = props.AdditionalProps) === null || _d === void 0 ? void 0 : _d.HeaderMap, isFileParseable, (_e = props.AdditionalProps) === null || _e === void 0 ? void 0 : _e.Fields]);
172
+ //Effect to parse rawfiledata initially
154
173
  React.useEffect(function () {
155
- if (props.RawFileData == null || props.AdditionalProps == null || rawDataRef.current === props.RawFileData)
174
+ var _a, _b;
175
+ if (props.RawFileData == null || props.AdditionalProps == null || rawDataRef.current === props.RawFileData || props.AdditionalProps.Data.length !== 0 || props.AdditionalProps.Headers.length !== 0)
156
176
  return;
157
177
  var parsedData;
158
178
  try {
159
179
  parsedData = parseCSV(props.RawFileData, props.AdditionalProps.DataHasHeaders, props.AdditionalProps.Fields.filter(function (field) { return field.Required; }).length);
160
180
  }
161
- catch (_a) {
181
+ catch (_c) {
162
182
  setIsFileParseable(false);
163
183
  return;
164
184
  }
165
185
  setIsFileParseable(true);
166
186
  setIsCSVMissingDataCells(parsedData.AddedMissingDataValues);
167
187
  setIsCSVMissingHeaders(parsedData.AddedMissingHeaders);
168
- setData(parsedData.Data);
169
- setHeaders(parsedData.Headers);
170
- setHeaderMap(autoMapHeaders(parsedData.Headers, props.AdditionalProps.Fields.map(function (field) { return field.Field; })));
188
+ (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.SetData(parsedData.Data);
189
+ props.AdditionalProps.SetHeaders(parsedData.Headers);
190
+ (_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.SetHeaderMap(autoMapHeaders(parsedData.Headers, props.AdditionalProps.Fields.map(function (field) { return field.Field; })));
171
191
  rawDataRef.current = props.RawFileData;
172
192
  }, [props.RawFileData, props.AdditionalProps]);
193
+ //Effect to add additional columns for required fields during mapping process
173
194
  React.useEffect(function () {
174
- var _a, _b;
175
- if (((_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Fields) == null || ((_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Fields.length) === 0 || data.length === 0)
195
+ var _a, _b, _c, _d, _e, _f, _g;
196
+ if (((_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Fields) == null || ((_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Fields.length) === 0 || ((_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.Data.length) === 0 || props.AdditionalProps.Headers == null)
197
+ return;
198
+ var requiredCount = props.AdditionalProps.Fields.filter(function (f) { return f.Required; }).length;
199
+ var optionalFields = props.AdditionalProps.Fields.filter(function (f) { return !f.Required; }).map(function (f) { return f.Field; });
200
+ var mappedOptionalCount = 0;
201
+ Array.from((_d = props.AdditionalProps) === null || _d === void 0 ? void 0 : _d.HeaderMap.values()).forEach(function (mappedField) {
202
+ if (mappedField != null && optionalFields.includes(mappedField))
203
+ mappedOptionalCount++;
204
+ });
205
+ var neededCols = requiredCount + mappedOptionalCount;
206
+ if (props.AdditionalProps.Headers.length >= neededCols)
207
+ return;
208
+ // Extend headers (A, B, C, etc.) until we reach 'neededCols'
209
+ var extendedHeaders = __spreadArray([], props.AdditionalProps.Headers, true);
210
+ for (var i = (_e = props.AdditionalProps) === null || _e === void 0 ? void 0 : _e.Headers.length; i < neededCols; i++) {
211
+ extendedHeaders.push(String.fromCharCode(65 + i)); // 'A', 'B', ...
212
+ }
213
+ // Extend every row in 'data' accordingly
214
+ var extendedData = (_f = props.AdditionalProps) === null || _f === void 0 ? void 0 : _f.Data.map(function (row) {
215
+ var currentCols = row.length - 1; // minus the row index at row[0]
216
+ if (currentCols < neededCols)
217
+ return __spreadArray(__spreadArray([], row, true), Array(neededCols - currentCols).fill(''), true);
218
+ return row;
219
+ });
220
+ (_g = props.AdditionalProps) === null || _g === void 0 ? void 0 : _g.SetHeaders(extendedHeaders);
221
+ props.AdditionalProps.SetData(extendedData);
222
+ }, [(_f = props.AdditionalProps) === null || _f === void 0 ? void 0 : _f.Fields, (_g = props.AdditionalProps) === null || _g === void 0 ? void 0 : _g.Headers, (_h = props.AdditionalProps) === null || _h === void 0 ? void 0 : _h.Data, (_j = props.AdditionalProps) === null || _j === void 0 ? void 0 : _j.HeaderMap]);
223
+ //Effect to add additionalFields that cant be determined at build time
224
+ React.useEffect(function () {
225
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j;
226
+ if (((_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Fields) == null || ((_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Fields.length) === 0 || ((_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.Data.length) === 0 || ((_d = props.AdditionalProps) === null || _d === void 0 ? void 0 : _d.Headers) == null)
176
227
  return;
177
228
  var requiredCount = props.AdditionalProps.Fields.filter(function (f) { return f.Required; }).length;
178
229
  // If we already have enough columns, do nothing
179
- if (headers.length >= requiredCount)
230
+ if (((_e = props.AdditionalProps) === null || _e === void 0 ? void 0 : _e.Headers.length) >= requiredCount)
180
231
  return;
181
232
  // Extend 'headers' array (e.g., "A", "B", "C"...)
182
- var extendedHeaders = __spreadArray([], headers, true);
183
- for (var i = headers.length; i < requiredCount; i++) {
233
+ var extendedHeaders = __spreadArray([], props.AdditionalProps.Headers, true);
234
+ for (var i = (_f = props.AdditionalProps) === null || _f === void 0 ? void 0 : _f.Headers.length; i < requiredCount; i++) {
184
235
  extendedHeaders.push(String.fromCharCode(65 + i)); // 'A', 'B', 'C', ...
185
236
  }
186
237
  // Extend each row in 'data' with blank strings for the new columns
187
- var extendedData = data.map(function (row) {
238
+ var extendedData = (_g = props.AdditionalProps) === null || _g === void 0 ? void 0 : _g.Data.map(function (row) {
188
239
  // row already has an index at row[0], plus (headers.length - 1) columns
189
240
  var neededCols = requiredCount - (row.length - 1);
190
241
  if (neededCols > 0) {
@@ -192,21 +243,23 @@ function CsvPipelineEditStep(props) {
192
243
  }
193
244
  return row;
194
245
  });
195
- setHeaders(extendedHeaders);
196
- setData(extendedData);
197
- }, [(_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Fields]);
246
+ (_h = props.AdditionalProps) === null || _h === void 0 ? void 0 : _h.SetHeaders(extendedHeaders);
247
+ (_j = props.AdditionalProps) === null || _j === void 0 ? void 0 : _j.SetData(extendedData);
248
+ }, [(_k = props.AdditionalProps) === null || _k === void 0 ? void 0 : _k.Fields, (_l = props.AdditionalProps) === null || _l === void 0 ? void 0 : _l.Headers, (_m = props.AdditionalProps) === null || _m === void 0 ? void 0 : _m.Data]);
198
249
  React.useEffect(function () {
250
+ var _a;
199
251
  if (props.AdditionalProps == null || props.Errors.length !== 0)
200
252
  return;
201
253
  var mappedData = [];
202
- data.forEach(function (row) {
254
+ (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Data.forEach(function (row) {
255
+ var _a;
203
256
  var record = {};
204
- headers.forEach(function (header, index) {
205
- var _a;
206
- var mappedField = headerMap.get(header);
257
+ (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Headers.forEach(function (header, index) {
258
+ var _a, _b;
259
+ var mappedField = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.HeaderMap.get(header);
207
260
  if (mappedField == null)
208
261
  return;
209
- var field = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Fields.find(function (f) { return f.Field === mappedField; });
262
+ var field = (_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.Fields.find(function (f) { return f.Field === mappedField; });
210
263
  if (field == null)
211
264
  return;
212
265
  var value = row[index + 1];
@@ -215,35 +268,46 @@ function CsvPipelineEditStep(props) {
215
268
  mappedData.push(record);
216
269
  });
217
270
  props.SetData(mappedData);
218
- }, [data, headers, headerMap, (_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.Fields, props.Errors]);
271
+ }, [(_o = props.AdditionalProps) === null || _o === void 0 ? void 0 : _o.Data, (_p = props.AdditionalProps) === null || _p === void 0 ? void 0 : _p.Headers, (_q = props.AdditionalProps) === null || _q === void 0 ? void 0 : _q.HeaderMap, (_r = props.AdditionalProps) === null || _r === void 0 ? void 0 : _r.Fields, props.Errors]);
219
272
  var getFieldSelect = React.useCallback(function (header) {
220
- var _a;
273
+ var _a, _b, _c;
221
274
  if (props.AdditionalProps == null || ((_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Fields.length) === 0)
222
275
  return;
223
- var field = headerMap.get(header);
224
- var updateMap = function (head, val) { return setHeaderMap(new Map(headerMap).set(head, val)); };
225
- var matchedField = props.AdditionalProps.Fields.find(function (f) { return f.Field === field; });
226
- var help = (matchedField === null || matchedField === void 0 ? void 0 : matchedField.Help) != null ? React.createElement("p", { style: { whiteSpace: 'nowrap' } },
227
- "=", matchedField === null || matchedField === void 0 ? void 0 :
228
- matchedField.Help) : undefined;
229
- return React.createElement(react_forms_1.Select, { Record: { Header: header, Value: field }, EmptyOption: true, Options: props.AdditionalProps.Fields.map(function (field) { return ({ Value: field.Field, Label: field.Label }); }), Field: "Value", Setter: function (record) { return updateMap(record.Header, record.Value); }, Label: ' ', Help: help });
230
- }, [(_d = props.AdditionalProps) === null || _d === void 0 ? void 0 : _d.Fields, headerMap]);
231
- var handleValueChange = function (rowIndex, colIndex, value) {
232
- setData(function (prevData) {
233
- var newData = __spreadArray([], prevData, true);
234
- newData[rowIndex][colIndex] = value;
235
- return newData;
276
+ var field = (_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.HeaderMap.get(header);
277
+ var usedFields = Array.from((_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.HeaderMap.entries())
278
+ .filter(function (_a) {
279
+ var mappedHeader = _a[0], mappedField = _a[1];
280
+ return mappedHeader !== header && mappedField != null;
281
+ })
282
+ .map(function (_a) {
283
+ var mappedField = _a[1];
284
+ return mappedField;
236
285
  });
237
- };
286
+ var selectOptions = props.AdditionalProps.Fields
287
+ .filter(function (f) { return !usedFields.includes(f.Field) || f.Field === field; })
288
+ .map(function (f) { return ({ Value: f.Field, Label: f.Label }); });
289
+ var updateMap = function (head, val) { var _a, _b; return (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.SetHeaderMap(new Map((_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.HeaderMap).set(head, val)); };
290
+ var matchedField = props.AdditionalProps.Fields.find(function (f) { return f.Field === field; });
291
+ var help = (matchedField === null || matchedField === void 0 ? void 0 : matchedField.Help) != null ? matchedField === null || matchedField === void 0 ? void 0 : matchedField.Help : undefined;
292
+ return React.createElement(react_forms_1.Select, { Record: { Header: header, Value: field }, EmptyOption: true, Label: ' ', Help: help, Options: selectOptions, Field: "Value", Setter: function (record) { return updateMap(record.Header, record.Value); } });
293
+ }, [(_s = props.AdditionalProps) === null || _s === void 0 ? void 0 : _s.Fields, (_t = props.AdditionalProps) === null || _t === void 0 ? void 0 : _t.HeaderMap]);
294
+ var handleValueChange = React.useCallback(function (rowIndex, colIndex, value) {
295
+ var _a, _b, _c;
296
+ var data = __spreadArray([], ((_b = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Data) !== null && _b !== void 0 ? _b : []), true);
297
+ data[rowIndex][colIndex] = value;
298
+ (_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.SetData(data);
299
+ }, [(_u = props.AdditionalProps) === null || _u === void 0 ? void 0 : _u.Data]);
238
300
  var handleRowDelete = function (rowIndex) {
239
- var newData = __spreadArray([], data, true);
301
+ var _a, _b, _c;
302
+ var newData = __spreadArray([], ((_b = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.Data) !== null && _b !== void 0 ? _b : []), true);
240
303
  newData.splice(rowIndex, 1);
241
- setData(newData);
304
+ (_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.SetData(newData);
242
305
  };
243
306
  var getHeader = function (header) {
307
+ var _a;
244
308
  if (props.AdditionalProps == null)
245
309
  return;
246
- var mappedField = headerMap.get(header);
310
+ var mappedField = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.HeaderMap.get(header);
247
311
  if (mappedField == null)
248
312
  return header;
249
313
  var matchedField = props.AdditionalProps.Fields.find(function (field) { return field.Field === mappedField; });
@@ -267,32 +331,33 @@ function CsvPipelineEditStep(props) {
267
331
  React.createElement("p", { style: { whiteSpace: 'nowrap' } }, isCSVMissingDataCells ? 'Missing data cells were added to meet the number of required fields.' : 'Missing headers were added to meet the number of required fields.'))))) : null,
268
332
  React.createElement("div", { className: 'row flex-grow-1', style: { overflowY: 'hidden' } },
269
333
  React.createElement("div", { className: 'col-12 h-100' },
270
- React.createElement(react_table_1.ConfigurableTable, { Data: pagedData, key: headers.join(','), SortKey: '', Ascending: false, OnSort: function () { }, KeySelector: function (data) { return data[0]; }, TheadStyle: { width: '100%', display: 'table-header-group', }, TbodyStyle: { width: '100%', display: 'block', height: '100%' }, RowStyle: { display: 'table-row', width: '100%', height: 'auto' }, TableStyle: { width: '100%', height: '100%', tableLayout: 'fixed', marginBottom: 0, display: 'block' }, TableClass: 'table', ModalZIndex: 9995 },
271
- headers.map(function (header, i) {
272
- return React.createElement(react_table_1.ConfigurableColumn, { Key: header, Label: header, Default: true },
273
- React.createElement(react_table_1.Column, { Key: header, Field: i + 1, AllowSort: false, Content: function (_a) {
274
- var item = _a.item, field = _a.field;
275
- if (props.AdditionalProps == null)
276
- return;
277
- var mappedField = headerMap.get(header);
278
- var matchedField = props.AdditionalProps.Fields.find(function (f) { return f.Field === mappedField; });
279
- if (matchedField == null)
280
- return item[field];
281
- var value = item[field];
282
- var isValid = matchedField.Validate(value);
283
- var feedback = matchedField.Feedback;
284
- var selectOptions = matchedField.SelectOptions;
285
- var allValues = {};
286
- headers.forEach(function (header, index) {
287
- var mappedField = headerMap.get(header);
288
- if (mappedField != null) {
289
- allValues[mappedField] = item[index + 1];
290
- }
291
- });
292
- return (React.createElement(matchedField.EditComponent, { Value: value, SetValue: function (val) { return handleValueChange(parseInt(item[0]), field, val); }, Valid: isValid, Feedback: feedback, AllRecordValues: allValues, SelectOptions: selectOptions }));
293
- } },
294
- getHeader(header),
295
- getFieldSelect(header)));
334
+ React.createElement(react_table_1.Table, { Data: pagedData, key: (_v = props.AdditionalProps) === null || _v === void 0 ? void 0 : _v.Headers.join(','), SortKey: '', Ascending: false, OnSort: function () { }, KeySelector: function (data) { return data[0]; }, TableClass: 'table', TableStyle: { height: '100%', width: ((_x = (_w = props.AdditionalProps) === null || _w === void 0 ? void 0 : _w.Headers.length) !== null && _x !== void 0 ? _x : 0) * 150 } }, (_y = props.AdditionalProps) === null || _y === void 0 ? void 0 :
335
+ _y.Headers.map(function (header, i) {
336
+ return React.createElement(react_table_1.Column, { Key: header, Field: i + 1, AllowSort: false, Content: function (_a) {
337
+ var _b, _c;
338
+ var item = _a.item, field = _a.field;
339
+ if (props.AdditionalProps == null)
340
+ return;
341
+ var mappedField = (_b = props.AdditionalProps) === null || _b === void 0 ? void 0 : _b.HeaderMap.get(header);
342
+ var matchedField = props.AdditionalProps.Fields.find(function (f) { return f.Field === mappedField; });
343
+ if (matchedField == null)
344
+ return item[field];
345
+ var value = item[field];
346
+ var isValid = matchedField.Validate(value);
347
+ var feedback = matchedField.Feedback;
348
+ var selectOptions = matchedField.SelectOptions;
349
+ var allValues = {};
350
+ (_c = props.AdditionalProps) === null || _c === void 0 ? void 0 : _c.Headers.forEach(function (header, index) {
351
+ var _a;
352
+ var mappedField = (_a = props.AdditionalProps) === null || _a === void 0 ? void 0 : _a.HeaderMap.get(header);
353
+ if (mappedField != null) {
354
+ allValues[mappedField] = item[index + 1];
355
+ }
356
+ });
357
+ return (React.createElement(matchedField.EditComponent, { Value: value, SetValue: function (val) { return handleValueChange(parseInt(item[0]), field, val); }, Valid: isValid, Feedback: feedback, AllRecordValues: allValues, SelectOptions: selectOptions }));
358
+ } },
359
+ getHeader(header),
360
+ getFieldSelect(header));
296
361
  }),
297
362
  React.createElement(react_table_1.Column, { Key: 'delete', Field: 0, AllowSort: false, RowStyle: { textAlign: 'right' }, Content: function (_a) {
298
363
  var item = _a.item;
@@ -301,7 +366,7 @@ function CsvPipelineEditStep(props) {
301
366
  } }, '')))),
302
367
  React.createElement("div", { className: 'row' },
303
368
  React.createElement("div", { className: 'col-12' },
304
- React.createElement(react_table_2.Paging, { Current: page + 1, Total: totalPages, SetPage: function (p) { return setPage(p - 1); } }))))
369
+ React.createElement(react_table_1.Paging, { Current: page + 1, Total: totalPages, SetPage: function (p) { return setPage(p - 1); } }))))
305
370
  : null)))));
306
371
  }
307
372
  //Helper functions
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gpa-gemstone/common-pages",
3
- "version": "0.0.125",
3
+ "version": "0.0.127",
4
4
  "description": "Common UI pages for GPA products",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -44,12 +44,12 @@
44
44
  "typescript": "5.5.3"
45
45
  },
46
46
  "dependencies": {
47
- "@gpa-gemstone/application-typings": "0.0.79",
47
+ "@gpa-gemstone/application-typings": "0.0.80",
48
48
  "@gpa-gemstone/gpa-symbols": "0.0.46",
49
49
  "@gpa-gemstone/helper-functions": "0.0.37",
50
- "@gpa-gemstone/react-forms": "1.1.78",
51
- "@gpa-gemstone/react-interactive": "1.0.138",
52
- "@gpa-gemstone/react-table": "1.2.59",
50
+ "@gpa-gemstone/react-forms": "1.1.79",
51
+ "@gpa-gemstone/react-interactive": "1.0.139",
52
+ "@gpa-gemstone/react-table": "1.2.61",
53
53
  "@reduxjs/toolkit": "1.8.3",
54
54
  "crypto-js": "^4.2.0",
55
55
  "moment": "^2.29.4",