@panneau/core 1.0.3 → 1.1.0

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 (7) hide show
  1. package/es/contexts.js +2 -2
  2. package/es/index.js +2 -2
  3. package/es/utils.js +9 -4
  4. package/lib/contexts.js +2 -2
  5. package/lib/index.js +2 -2
  6. package/lib/utils.js +9 -4
  7. package/package.json +3 -3
package/es/contexts.js CHANGED
@@ -248,13 +248,13 @@ var toggle = PropTypes.shape({
248
248
  label: PropTypes.string
249
249
  });
250
250
  PropTypes.arrayOf(toggle);
251
- var tableColumn = PropTypes.shape({
251
+ var tableColumn = PropTypes.oneOfType([PropTypes.string, PropTypes.shape({
252
252
  id: PropTypes.string,
253
253
  component: PropTypes.string,
254
254
  path: PropTypes.string,
255
255
  field: PropTypes.string,
256
256
  columnClassName: PropTypes.string
257
- });
257
+ })]);
258
258
  PropTypes.arrayOf(tableColumn);
259
259
 
260
260
  /**
package/es/index.js CHANGED
@@ -63,13 +63,13 @@ var toggle = PropTypes$1.shape({
63
63
  label: PropTypes$1.string
64
64
  });
65
65
  var toggles = PropTypes$1.arrayOf(toggle);
66
- var tableColumn = PropTypes$1.shape({
66
+ var tableColumn = PropTypes$1.oneOfType([PropTypes$1.string, PropTypes$1.shape({
67
67
  id: PropTypes$1.string,
68
68
  component: PropTypes$1.string,
69
69
  path: PropTypes$1.string,
70
70
  field: PropTypes$1.string,
71
71
  columnClassName: PropTypes$1.string
72
- });
72
+ })]);
73
73
  var tableColumns = PropTypes$1.arrayOf(tableColumn);
74
74
 
75
75
  /**
package/es/utils.js CHANGED
@@ -79,7 +79,7 @@ var getComponent = function getComponent(component) {
79
79
  };
80
80
  };
81
81
 
82
- var _excluded = ["field"];
82
+ var _excluded = ["id", "field"];
83
83
  var getColumnFromField = function getColumnFromField(field) {
84
84
  if (field === null) {
85
85
  return null;
@@ -110,12 +110,17 @@ var getColumnsWithFields = function getColumnsWithFields(resource, columns) {
110
110
  var _ref = isString(column) ? {
111
111
  field: column
112
112
  } : column,
113
+ _ref$id = _ref.id,
114
+ colId = _ref$id === void 0 ? null : _ref$id,
113
115
  _ref$field = _ref.field,
114
- fieldName = _ref$field === void 0 ? null : _ref$field,
116
+ colField = _ref$field === void 0 ? null : _ref$field,
115
117
  otherProps = _objectWithoutProperties(_ref, _excluded);
116
- return _objectSpread(_objectSpread({}, fieldName !== null ? getColumnFromField(fields.find(function (it) {
118
+ var fieldName = colField || colId;
119
+ return _objectSpread(_objectSpread(_objectSpread({}, fieldName !== null ? getColumnFromField(fields.find(function (it) {
117
120
  return it.name === fieldName;
118
- }) || null) : null), otherProps);
121
+ }) || null) : null), otherProps), {}, {
122
+ id: colId
123
+ });
119
124
  }).filter(function (it) {
120
125
  return it !== null;
121
126
  }) : [];
package/lib/contexts.js CHANGED
@@ -283,13 +283,13 @@ var toggle = PropTypes__default["default"].shape({
283
283
  label: PropTypes__default["default"].string
284
284
  });
285
285
  PropTypes__default["default"].arrayOf(toggle);
286
- var tableColumn = PropTypes__default["default"].shape({
286
+ var tableColumn = PropTypes__default["default"].oneOfType([PropTypes__default["default"].string, PropTypes__default["default"].shape({
287
287
  id: PropTypes__default["default"].string,
288
288
  component: PropTypes__default["default"].string,
289
289
  path: PropTypes__default["default"].string,
290
290
  field: PropTypes__default["default"].string,
291
291
  columnClassName: PropTypes__default["default"].string
292
- });
292
+ })]);
293
293
  PropTypes__default["default"].arrayOf(tableColumn);
294
294
 
295
295
  /**
package/lib/index.js CHANGED
@@ -85,13 +85,13 @@ var toggle = PropTypes__default["default"].shape({
85
85
  label: PropTypes__default["default"].string
86
86
  });
87
87
  var toggles = PropTypes__default["default"].arrayOf(toggle);
88
- var tableColumn = PropTypes__default["default"].shape({
88
+ var tableColumn = PropTypes__default["default"].oneOfType([PropTypes__default["default"].string, PropTypes__default["default"].shape({
89
89
  id: PropTypes__default["default"].string,
90
90
  component: PropTypes__default["default"].string,
91
91
  path: PropTypes__default["default"].string,
92
92
  field: PropTypes__default["default"].string,
93
93
  columnClassName: PropTypes__default["default"].string
94
- });
94
+ })]);
95
95
  var tableColumns = PropTypes__default["default"].arrayOf(tableColumn);
96
96
 
97
97
  /**
package/lib/utils.js CHANGED
@@ -98,7 +98,7 @@ var getComponent = function getComponent(component) {
98
98
  };
99
99
  };
100
100
 
101
- var _excluded = ["field"];
101
+ var _excluded = ["id", "field"];
102
102
  var getColumnFromField = function getColumnFromField(field) {
103
103
  if (field === null) {
104
104
  return null;
@@ -129,12 +129,17 @@ var getColumnsWithFields = function getColumnsWithFields(resource, columns) {
129
129
  var _ref = isString__default["default"](column) ? {
130
130
  field: column
131
131
  } : column,
132
+ _ref$id = _ref.id,
133
+ colId = _ref$id === void 0 ? null : _ref$id,
132
134
  _ref$field = _ref.field,
133
- fieldName = _ref$field === void 0 ? null : _ref$field,
135
+ colField = _ref$field === void 0 ? null : _ref$field,
134
136
  otherProps = _objectWithoutProperties__default["default"](_ref, _excluded);
135
- return _objectSpread__default["default"](_objectSpread__default["default"]({}, fieldName !== null ? getColumnFromField(fields.find(function (it) {
137
+ var fieldName = colField || colId;
138
+ return _objectSpread__default["default"](_objectSpread__default["default"](_objectSpread__default["default"]({}, fieldName !== null ? getColumnFromField(fields.find(function (it) {
136
139
  return it.name === fieldName;
137
- }) || null) : null), otherProps);
140
+ }) || null) : null), otherProps), {}, {
141
+ id: colId
142
+ });
138
143
  }).filter(function (it) {
139
144
  return it !== null;
140
145
  }) : [];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/core",
3
- "version": "1.0.3",
3
+ "version": "1.1.0",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -88,7 +88,7 @@
88
88
  "@uppy/tus": "^2.2.0",
89
89
  "@uppy/webcam": "^2.0.5",
90
90
  "@uppy/xhr-upload": "^2.0.7",
91
- "bootstrap": "5.2.0-beta1",
91
+ "bootstrap": "^5.2.0",
92
92
  "change-case": "^4.1.2",
93
93
  "classnames": "^2.2.6",
94
94
  "css-mediaquery": "^0.1.2",
@@ -114,5 +114,5 @@
114
114
  "publishConfig": {
115
115
  "access": "public"
116
116
  },
117
- "gitHead": "59e6842b1a768acb6fa826e6a6396d09e239c955"
117
+ "gitHead": "1d4ce10073e63024309c615ffaec2e1193aeec7e"
118
118
  }