@panneau/app 2.0.91 → 2.0.92

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 (3) hide show
  1. package/es/index.js +18 -27
  2. package/lib/index.js +17 -26
  3. package/package.json +30 -30
package/es/index.js CHANGED
@@ -21,7 +21,7 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
21
21
  import isObject from 'lodash/isObject';
22
22
  import queryString from 'query-string';
23
23
  import { FormattedMessage, defineMessages } from 'react-intl';
24
- import { useResourceUrlGenerator } from '@panneau/core/hooks';
24
+ import { useResourceUrlGenerator, useResourceTypeName } from '@panneau/core/hooks';
25
25
  import ResourceForm from '@panneau/form-resource';
26
26
  import classNames from 'classnames';
27
27
  import { Modals } from '@panneau/element-modal';
@@ -297,7 +297,9 @@ var PageHeader = function PageHeader(_ref) {
297
297
  var inner = /*#__PURE__*/React.createElement("div", {
298
298
  className: "d-flex align-items-center flex-wrap"
299
299
  }, title !== null ? /*#__PURE__*/React.createElement("h1", {
300
- className: "mb-0"
300
+ className: classNames(['mb-0', {
301
+ h2: small
302
+ }])
301
303
  }, /*#__PURE__*/React.createElement(Label, null, title)) : null, actions !== null ? /*#__PURE__*/React.createElement("div", {
302
304
  className: "ms-auto"
303
305
  }, actions) : null);
@@ -330,27 +332,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
330
332
  _useMemo$type = _useMemo.type,
331
333
  type = _useMemo$type === void 0 ? null : _useMemo$type;
332
334
  var resourceValues = useResourceValues(resource);
333
- var typeName = useMemo(function () {
334
- var _ref2 = resource || {},
335
- _ref2$types = _ref2.types,
336
- types = _ref2$types === void 0 ? [] : _ref2$types,
337
- _ref2$settings = _ref2.settings,
338
- settings = _ref2$settings === void 0 ? {} : _ref2$settings;
339
- var _ref3 = settings || {},
340
- _ref3$hideTypeNames = _ref3.hideTypeNames,
341
- hideTypeNames = _ref3$hideTypeNames === void 0 ? false : _ref3$hideTypeNames;
342
- if (hideTypeNames) {
343
- return null;
344
- }
345
- var _ref4 = type !== null && types !== null && types.length > 1 ? (types || []).find(function (_ref5) {
346
- var _ref5$id = _ref5.id,
347
- id = _ref5$id === void 0 ? null : _ref5$id;
348
- return id === type;
349
- }) || {} : {},
350
- _ref4$name = _ref4.name,
351
- name = _ref4$name === void 0 ? null : _ref4$name;
352
- return name;
353
- }, [type, resource]);
335
+ var typeName = useResourceTypeName(resource, type);
354
336
  var onSuccess = useCallback(function () {
355
337
  navigate("".concat(resourceRoute('index'), "?created=true"));
356
338
  }, [navigate, resourceRoute]);
@@ -399,14 +381,18 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
399
381
  var resourceRoute = useResourceUrlGenerator(resource);
400
382
  var _useResourceItem = useResourceItem(resource, itemId),
401
383
  item = _useResourceItem.item;
384
+ var _ref2 = item || {},
385
+ _ref2$type = _ref2.type,
386
+ type = _ref2$type === void 0 ? null : _ref2$type;
402
387
  var resourceValues = useResourceValues(resource);
388
+ var typeName = useResourceTypeName(resource, type);
403
389
  var onSuccess = useCallback(function () {
404
390
  return navigate("".concat(resourceRoute('index'), "?deleted=true"));
405
391
  }, [navigate, resourceRoute]);
406
392
  return /*#__PURE__*/React.createElement(ResourceProvider, {
407
393
  resource: resource
408
394
  }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
409
- title: /*#__PURE__*/React.createElement(FormattedMessage, {
395
+ title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormattedMessage, {
410
396
  values: resourceValues,
411
397
  id: "zN5N/Q",
412
398
  defaultMessage: [{
@@ -416,7 +402,9 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
416
402
  "type": 1,
417
403
  "value": "a_singular"
418
404
  }]
419
- }),
405
+ }), typeName !== null ? /*#__PURE__*/React.createElement("span", {
406
+ className: "text-body-secondary"
407
+ }, " (", typeName, ")") : null),
420
408
  small: true
421
409
  }), /*#__PURE__*/React.createElement("div", {
422
410
  className: "container-sm py-4"
@@ -451,6 +439,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
451
439
  _useState2 = _slicedToArray(_useState, 2),
452
440
  editItem = _useState2[0],
453
441
  setEditItem = _useState2[1];
442
+ var typeName = useResourceTypeName(resource, type);
454
443
  var onSuccess = useCallback(function (newItem) {
455
444
  return setEditItem(newItem);
456
445
  }, []);
@@ -461,7 +450,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
461
450
  return /*#__PURE__*/React.createElement(ResourceProvider, {
462
451
  resource: resource
463
452
  }, /*#__PURE__*/React.createElement(MainLayout, null, /*#__PURE__*/React.createElement(PageHeader, {
464
- title: /*#__PURE__*/React.createElement(FormattedMessage, {
453
+ title: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormattedMessage, {
465
454
  values: resourceValues,
466
455
  id: "mCfzkJ",
467
456
  defaultMessage: [{
@@ -471,7 +460,9 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
471
460
  "type": 1,
472
461
  "value": "a_singular"
473
462
  }]
474
- }),
463
+ }), typeName !== null ? /*#__PURE__*/React.createElement("span", {
464
+ className: "text-body-secondary"
465
+ }, " (", typeName, ")") : null),
475
466
  small: true
476
467
  }), /*#__PURE__*/React.createElement("div", {
477
468
  className: "container-sm py-4"
package/lib/index.js CHANGED
@@ -331,7 +331,9 @@ var PageHeader = function PageHeader(_ref) {
331
331
  var inner = /*#__PURE__*/React__default["default"].createElement("div", {
332
332
  className: "d-flex align-items-center flex-wrap"
333
333
  }, title !== null ? /*#__PURE__*/React__default["default"].createElement("h1", {
334
- className: "mb-0"
334
+ className: classNames__default["default"](['mb-0', {
335
+ h2: small
336
+ }])
335
337
  }, /*#__PURE__*/React__default["default"].createElement(Label__default["default"], null, title)) : null, actions !== null ? /*#__PURE__*/React__default["default"].createElement("div", {
336
338
  className: "ms-auto"
337
339
  }, actions) : null);
@@ -364,27 +366,7 @@ var ResourceCreatePage = function ResourceCreatePage(_ref) {
364
366
  _useMemo$type = _useMemo.type,
365
367
  type = _useMemo$type === void 0 ? null : _useMemo$type;
366
368
  var resourceValues = intl.useResourceValues(resource);
367
- var typeName = React.useMemo(function () {
368
- var _ref2 = resource || {},
369
- _ref2$types = _ref2.types,
370
- types = _ref2$types === void 0 ? [] : _ref2$types,
371
- _ref2$settings = _ref2.settings,
372
- settings = _ref2$settings === void 0 ? {} : _ref2$settings;
373
- var _ref3 = settings || {},
374
- _ref3$hideTypeNames = _ref3.hideTypeNames,
375
- hideTypeNames = _ref3$hideTypeNames === void 0 ? false : _ref3$hideTypeNames;
376
- if (hideTypeNames) {
377
- return null;
378
- }
379
- var _ref4 = type !== null && types !== null && types.length > 1 ? (types || []).find(function (_ref5) {
380
- var _ref5$id = _ref5.id,
381
- id = _ref5$id === void 0 ? null : _ref5$id;
382
- return id === type;
383
- }) || {} : {},
384
- _ref4$name = _ref4.name,
385
- name = _ref4$name === void 0 ? null : _ref4$name;
386
- return name;
387
- }, [type, resource]);
369
+ var typeName = hooks.useResourceTypeName(resource, type);
388
370
  var onSuccess = React.useCallback(function () {
389
371
  navigate("".concat(resourceRoute('index'), "?created=true"));
390
372
  }, [navigate, resourceRoute]);
@@ -433,14 +415,18 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
433
415
  var resourceRoute = hooks.useResourceUrlGenerator(resource);
434
416
  var _useResourceItem = data.useResourceItem(resource, itemId),
435
417
  item = _useResourceItem.item;
418
+ var _ref2 = item || {},
419
+ _ref2$type = _ref2.type,
420
+ type = _ref2$type === void 0 ? null : _ref2$type;
436
421
  var resourceValues = intl.useResourceValues(resource);
422
+ var typeName = hooks.useResourceTypeName(resource, type);
437
423
  var onSuccess = React.useCallback(function () {
438
424
  return navigate("".concat(resourceRoute('index'), "?deleted=true"));
439
425
  }, [navigate, resourceRoute]);
440
426
  return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
441
427
  resource: resource
442
428
  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
443
- title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
429
+ title: /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
444
430
  values: resourceValues,
445
431
  id: "zN5N/Q",
446
432
  defaultMessage: [{
@@ -450,7 +436,9 @@ var ResourceDeletePage = function ResourceDeletePage(_ref) {
450
436
  "type": 1,
451
437
  "value": "a_singular"
452
438
  }]
453
- }),
439
+ }), typeName !== null ? /*#__PURE__*/React__default["default"].createElement("span", {
440
+ className: "text-body-secondary"
441
+ }, " (", typeName, ")") : null),
454
442
  small: true
455
443
  }), /*#__PURE__*/React__default["default"].createElement("div", {
456
444
  className: "container-sm py-4"
@@ -485,6 +473,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
485
473
  _useState2 = _slicedToArray__default["default"](_useState, 2),
486
474
  editItem = _useState2[0],
487
475
  setEditItem = _useState2[1];
476
+ var typeName = hooks.useResourceTypeName(resource, type);
488
477
  var onSuccess = React.useCallback(function (newItem) {
489
478
  return setEditItem(newItem);
490
479
  }, []);
@@ -495,7 +484,7 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
495
484
  return /*#__PURE__*/React__default["default"].createElement(contexts.ResourceProvider, {
496
485
  resource: resource
497
486
  }, /*#__PURE__*/React__default["default"].createElement(MainLayout, null, /*#__PURE__*/React__default["default"].createElement(PageHeader, {
498
- title: /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
487
+ title: /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(reactIntl.FormattedMessage, {
499
488
  values: resourceValues,
500
489
  id: "mCfzkJ",
501
490
  defaultMessage: [{
@@ -505,7 +494,9 @@ var ResourceEditPage = function ResourceEditPage(_ref) {
505
494
  "type": 1,
506
495
  "value": "a_singular"
507
496
  }]
508
- }),
497
+ }), typeName !== null ? /*#__PURE__*/React__default["default"].createElement("span", {
498
+ className: "text-body-secondary"
499
+ }, " (", typeName, ")") : null),
509
500
  small: true
510
501
  }), /*#__PURE__*/React__default["default"].createElement("div", {
511
502
  className: "container-sm py-4"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@panneau/app",
3
- "version": "2.0.91",
3
+ "version": "2.0.92",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -63,34 +63,34 @@
63
63
  "@fortawesome/fontawesome-svg-core": "^1.2.35",
64
64
  "@fortawesome/free-solid-svg-icons": "^5.15.3",
65
65
  "@fortawesome/react-fontawesome": "^0.1.14",
66
- "@panneau/auth": "^2.0.91",
67
- "@panneau/core": "^2.0.91",
68
- "@panneau/data": "^2.0.91",
69
- "@panneau/displays": "^2.0.91",
70
- "@panneau/element-alert": "^2.0.91",
71
- "@panneau/element-button": "^2.0.91",
72
- "@panneau/element-buttons": "^2.0.91",
73
- "@panneau/element-dropdown": "^2.0.91",
74
- "@panneau/element-form": "^2.0.91",
75
- "@panneau/element-form-group": "^2.0.91",
76
- "@panneau/element-label": "^2.0.91",
77
- "@panneau/element-link": "^2.0.91",
78
- "@panneau/element-loading": "^2.0.91",
79
- "@panneau/element-menu": "^2.0.91",
80
- "@panneau/element-modal": "^2.0.91",
81
- "@panneau/element-navbar": "^2.0.91",
82
- "@panneau/element-pagination": "^2.0.91",
83
- "@panneau/element-radios": "^2.0.91",
84
- "@panneau/fields": "^2.0.91",
85
- "@panneau/filter-filters": "^2.0.91",
86
- "@panneau/filters": "^2.0.91",
87
- "@panneau/form-resource": "^2.0.91",
88
- "@panneau/forms": "^2.0.91",
89
- "@panneau/intl": "^2.0.91",
90
- "@panneau/list-resource-items": "^2.0.91",
91
- "@panneau/lists": "^2.0.91",
92
- "@panneau/modals": "^2.0.91",
93
- "@panneau/themes": "^2.0.91",
66
+ "@panneau/auth": "^2.0.92",
67
+ "@panneau/core": "^2.0.92",
68
+ "@panneau/data": "^2.0.92",
69
+ "@panneau/displays": "^2.0.92",
70
+ "@panneau/element-alert": "^2.0.92",
71
+ "@panneau/element-button": "^2.0.92",
72
+ "@panneau/element-buttons": "^2.0.92",
73
+ "@panneau/element-dropdown": "^2.0.92",
74
+ "@panneau/element-form": "^2.0.92",
75
+ "@panneau/element-form-group": "^2.0.92",
76
+ "@panneau/element-label": "^2.0.92",
77
+ "@panneau/element-link": "^2.0.92",
78
+ "@panneau/element-loading": "^2.0.92",
79
+ "@panneau/element-menu": "^2.0.92",
80
+ "@panneau/element-modal": "^2.0.92",
81
+ "@panneau/element-navbar": "^2.0.92",
82
+ "@panneau/element-pagination": "^2.0.92",
83
+ "@panneau/element-radios": "^2.0.92",
84
+ "@panneau/fields": "^2.0.92",
85
+ "@panneau/filter-filters": "^2.0.92",
86
+ "@panneau/filters": "^2.0.92",
87
+ "@panneau/form-resource": "^2.0.92",
88
+ "@panneau/forms": "^2.0.92",
89
+ "@panneau/intl": "^2.0.92",
90
+ "@panneau/list-resource-items": "^2.0.92",
91
+ "@panneau/lists": "^2.0.92",
92
+ "@panneau/modals": "^2.0.92",
93
+ "@panneau/themes": "^2.0.92",
94
94
  "classnames": "^2.2.6",
95
95
  "lodash": "^4.17.21",
96
96
  "prop-types": "^15.7.2",
@@ -102,5 +102,5 @@
102
102
  "publishConfig": {
103
103
  "access": "public"
104
104
  },
105
- "gitHead": "a0ea54191eb4d1f28d0918203f483f11d7b9e52f"
105
+ "gitHead": "d0ff80c8a3a73f8ca115de91d4eaec8c3ea0b348"
106
106
  }