Skip to content

Commit 83e9e1f

Browse files
sampsonjsampsonj
authored
* bump deps, regenerate lib * message card, release chip design elements * tidy message card icon styling * propagate styling updates * prepare v2.2.0
1 parent 01ced3e commit 83e9e1f

File tree

121 files changed

+5854
-3160
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+5854
-3160
lines changed

‎jest.config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ module.exports = {
55
'<rootDir>/src/',
66
],
77
moduleNameMapper: {
8-
'@fontsource/inter': '<rootDir>/src/__mocks__/fileMock.js',
8+
'@stomp/stompjs': '<rootDir>/src/__mocks__/fileMock.js',
9+
'@stomp/rx-stomp': '<rootDir>/src/__mocks__/fileMock.js',
910
'(pdfjs-dist/legacy/build/pdf.worker)': '<rootDir>/src/__mocks__/constructorMock.js',
1011
'\\.(css|less)$': '<rootDir>/src/__mocks__/styleMock.js',
1112
'\\.(svg)$': '<rootDir>/src/__mocks__/svgMock.js',

‎lib/components/AopDataViewer/AopDataViewer.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
4444
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
4545
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
4646
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
47-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
48-
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
47+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
48+
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
4949
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
5050
var MIN_IFRAME_WIDTH = 240;
5151

‎lib/components/Bundles/DataProductBundleCard.d.ts‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import React from 'react';
22
export interface DataProductBundleCardClasses {
3-
card?: string;
4-
cardContent?: string;
5-
cardContentFlexContainer?: string;
6-
cardContentContainer?: string;
73
cardIcon?: string;
84
}
95
export interface DataProductBundleCardProps {
@@ -12,7 +8,6 @@ export interface DataProductBundleCardProps {
128
subTitleContent?: React.ReactNode;
139
customContent?: React.ReactNode;
1410
isSplit?: boolean;
15-
showIcon?: boolean;
1611
classes?: DataProductBundleCardClasses;
1712
}
1813
declare const DataProductBundleCard: React.FC<DataProductBundleCardProps>;

‎lib/components/Bundles/DataProductBundleCard.js‎

Lines changed: 28 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,33 @@ Object.defineProperty(exports, "__esModule", {
55
});
66
exports.default = void 0;
77
var _react = _interopRequireDefault(require("react"));
8-
var _Card = _interopRequireDefault(require("@material-ui/core/Card"));
9-
var _CardContent = _interopRequireDefault(require("@material-ui/core/CardContent"));
108
var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
119
var _styles = require("@material-ui/core/styles");
1210
var _reactFontawesome = require("@fortawesome/react-fontawesome");
1311
var _freeSolidSvgIcons = require("@fortawesome/free-solid-svg-icons");
12+
var _InfoMessageCard = _interopRequireDefault(require("../Card/InfoMessageCard"));
1413
var _Theme = _interopRequireDefault(require("../Theme/Theme"));
1514
var _typeUtil = require("../../util/typeUtil");
1615
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
1716
var useStyles = (0, _styles.makeStyles)(function (theme) {
1817
return {
19-
card: {
20-
backgroundColor: _Theme.default.colors.GOLD[50],
21-
borderColor: _Theme.default.colors.GOLD[200],
22-
marginTop: theme.spacing(1)
23-
},
24-
cardContent: {
25-
padding: theme.spacing(2),
26-
paddingBottom: "".concat(theme.spacing(2), "px !important")
27-
},
28-
cardContentFlexContainer: {
29-
display: 'flex',
30-
alignItems: 'center',
31-
padding: theme.spacing(2),
32-
paddingBottom: "".concat(theme.spacing(2), "px !important")
33-
},
34-
cardContentContainer: {
35-
flexGrow: 1
36-
},
3718
cardIcon: {
38-
color: theme.colors.GOLD[700],
39-
padding: '5px',
40-
fontSize: '2.3875em',
19+
color: 'rgba(0, 0, 0, 0.9)',
20+
padding: '5px 0px',
21+
fontSize: '1.5em',
4122
marginRight: theme.spacing(2)
4223
},
43-
cardIconBoxesStacked: {
44-
color: theme.colors.GOLD[700],
45-
fontSize: '2.3875em',
46-
marginRight: theme.spacing(2)
24+
cardSecondaryIcon: {
25+
color: 'rgba(138, 191, 236, 0.9)',
26+
// theme.colors.LIGHT_BLUE[200] with 'a' value applied
27+
marginLeft: theme.spacing(2),
28+
fontSize: '1.5rem'
29+
},
30+
cardTitleContentContainer: {
31+
padding: theme.spacing(2, 2.5, 0.5, 2.5)
32+
},
33+
cardMessageContentContainer: {
34+
padding: theme.spacing(0.25, 2.5, 2, 2.5)
4735
}
4836
};
4937
});
@@ -54,12 +42,7 @@ var DataProductBundleCard = function DataProductBundleCard(props) {
5442
detailContent = props.detailContent,
5543
customContent = props.customContent,
5644
isSplit = props.isSplit,
57-
showIcon = props.showIcon,
5845
customClasses = props.classes;
59-
var customCardClass = customClasses ? customClasses.card : undefined;
60-
var customCardContentClass = customClasses ? customClasses.cardContent : undefined;
61-
var customCardContentFlexContainerClass = customClasses ? customClasses.cardContentFlexContainer : undefined;
62-
var customCardContentContainerClass = customClasses ? customClasses.cardContentContainer : undefined;
6346
var customIconClass = customClasses ? customClasses.cardIcon : undefined;
6447
var renderContent = function renderContent() {
6548
if ((0, _typeUtil.exists)(customContent)) {
@@ -75,31 +58,27 @@ var DataProductBundleCard = function DataProductBundleCard(props) {
7558
variant: "body2"
7659
}, subTitleContent));
7760
};
78-
var renderCardContent = function renderCardContent() {
79-
if (!showIcon) {
80-
return renderContent();
81-
}
82-
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
61+
return /*#__PURE__*/_react.default.createElement(_InfoMessageCard.default, {
62+
title: "Data Product Bundle",
63+
messageContent: renderContent(),
64+
icon: /*#__PURE__*/_react.default.createElement(_reactFontawesome.FontAwesomeIcon, {
8365
icon: isSplit ? _freeSolidSvgIcons.faBoxesStacked : _freeSolidSvgIcons.faBox,
84-
size: "2x",
85-
className: customIconClass || isSplit ? classes.cardIconBoxesStacked : classes.cardIcon
86-
}), /*#__PURE__*/_react.default.createElement("div", {
87-
className: customCardContentContainerClass || classes.cardContentContainer
88-
}, renderContent()));
89-
};
90-
return /*#__PURE__*/_react.default.createElement(_Card.default, {
91-
className: customCardClass || classes.card
92-
}, /*#__PURE__*/_react.default.createElement(_CardContent.default, {
93-
className: showIcon ? customCardContentFlexContainerClass || classes.cardContentFlexContainer : customCardContentClass || classes.cardContent
94-
}, renderCardContent()));
66+
size: "1x",
67+
className: customIconClass || classes.cardIcon
68+
}),
69+
classes: {
70+
secondaryIcon: classes.cardSecondaryIcon,
71+
cardTitleContentContainer: classes.cardTitleContentContainer,
72+
messageContentContainer: classes.cardMessageContentContainer
73+
}
74+
});
9575
};
9676
DataProductBundleCard.defaultProps = {
9777
titleContent: undefined,
9878
detailContent: undefined,
9979
subTitleContent: undefined,
10080
customContent: undefined,
10181
isSplit: false,
102-
showIcon: true,
10382
classes: undefined
10483
};
10584
var _default = DataProductBundleCard;

‎lib/components/Button/SplitButton.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
2525
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
2626
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
2727
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
28-
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
29-
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0) { ; } } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
28+
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
29+
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
3030
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
3131
var SplitButton = function SplitButton(props) {
3232
var name = props.name,

‎lib/components/Card/BaseCard.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ var useStyles = (0, _styles.makeStyles)(function (muiTheme) {
3838
})
3939
);
4040
});
41-
var CardType;
42-
exports.CardType = CardType;
43-
(function (CardType) {
41+
var CardType = /*#__PURE__*/function (CardType) {
4442
CardType["INFO"] = "INFO";
4543
CardType["WARN"] = "WARN";
4644
CardType["ERROR"] = "ERROR";
47-
})(CardType || (exports.CardType = CardType = {}));
45+
return CardType;
46+
}({});
47+
exports.CardType = CardType;
4848
var BaseCard = function BaseCard(props) {
4949
var classes = useStyles(_Theme.default);
5050
var type = props.type,

‎lib/components/Card/BaseMessageCard.d.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
import React from 'react';
2+
export declare enum MessageCardType {
3+
INFO = "INFO"
4+
}
5+
export interface BaseMessageCardClasses {
6+
card: string;
7+
primaryIcon: string;
8+
secondaryIcon: string;
9+
cardTitleContentContainer?: string;
10+
messageContentContainer?: string;
11+
}
12+
export interface BaseMessageCardProps {
13+
type: MessageCardType;
14+
messageCardClasses: BaseMessageCardClasses;
15+
icon?: React.ReactNode;
16+
title?: string;
17+
titleContent?: React.ReactNode;
18+
message?: string;
19+
messageContent?: React.ReactNode;
20+
}
21+
declare const BaseMessageCard: React.FC<BaseMessageCardProps>;
22+
export default BaseMessageCard;

‎lib/components/Card/BaseMessageCard.js‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
"use strict";
2+
3+
Object.defineProperty(exports, "__esModule", {
4+
value: true
5+
});
6+
exports.default = exports.MessageCardType = void 0;
7+
var _react = _interopRequireDefault(require("react"));
8+
var _Card = _interopRequireDefault(require("@material-ui/core/Card"));
9+
var _CardContent = _interopRequireDefault(require("@material-ui/core/CardContent"));
10+
var _Typography = _interopRequireDefault(require("@material-ui/core/Typography"));
11+
var _styles = require("@material-ui/core/styles");
12+
var _InfoOutlined = _interopRequireDefault(require("@material-ui/icons/InfoOutlined"));
13+
var _Theme = _interopRequireDefault(require("../Theme/Theme"));
14+
var _typeUtil = require("../../util/typeUtil");
15+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
16+
/* eslint-disable react/require-default-props */
17+
18+
var useStyles = (0, _styles.makeStyles)(function (muiTheme) {
19+
return (
20+
// eslint-disable-next-line implicit-arrow-linebreak
21+
(0, _styles.createStyles)({
22+
startFlex: {
23+
display: 'flex',
24+
justifyContent: 'flex-start',
25+
alignItems: 'center'
26+
},
27+
titleContentContainer: {
28+
padding: muiTheme.spacing(2, 2.5, 1.5, 2.5)
29+
},
30+
textTitleContent: {
31+
flexGrow: 1,
32+
textTransform: 'uppercase',
33+
fontSize: '0.775rem'
34+
},
35+
messageContainer: {
36+
padding: muiTheme.spacing(0, 3, 3, 3)
37+
}
38+
})
39+
);
40+
});
41+
var MessageCardType = /*#__PURE__*/function (MessageCardType) {
42+
MessageCardType["INFO"] = "INFO";
43+
return MessageCardType;
44+
}({});
45+
exports.MessageCardType = MessageCardType;
46+
var BaseMessageCard = function BaseMessageCard(props) {
47+
var classes = useStyles(_Theme.default);
48+
var type = props.type,
49+
messageCardClasses = props.messageCardClasses,
50+
icon = props.icon,
51+
title = props.title,
52+
titleContent = props.titleContent,
53+
message = props.message,
54+
messageContent = props.messageContent;
55+
var appliedTitleContentContainer = classes.titleContentContainer;
56+
if (messageCardClasses && messageCardClasses.cardTitleContentContainer) {
57+
appliedTitleContentContainer = messageCardClasses.cardTitleContentContainer;
58+
}
59+
var iconContent = /*#__PURE__*/_react.default.createElement(_InfoOutlined.default, {
60+
fontSize: "small",
61+
className: messageCardClasses.primaryIcon
62+
});
63+
var secondaryIconContent = null;
64+
switch (type) {
65+
case MessageCardType.INFO:
66+
if ((0, _typeUtil.exists)(icon)) {
67+
// eslint-disable-next-line react/jsx-no-useless-fragment
68+
iconContent = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, icon);
69+
}
70+
secondaryIconContent = /*#__PURE__*/_react.default.createElement(_InfoOutlined.default, {
71+
fontSize: "large",
72+
className: messageCardClasses.secondaryIcon
73+
});
74+
break;
75+
default:
76+
break;
77+
}
78+
var renderTitle = function renderTitle() {
79+
var titleTextContent = null;
80+
if ((0, _typeUtil.isStringNonEmpty)(title)) {
81+
titleTextContent = /*#__PURE__*/_react.default.createElement(_Typography.default, {
82+
variant: "subtitle2",
83+
className: classes.textTitleContent
84+
}, title);
85+
}
86+
var appliedTitleContent = null;
87+
if ((0, _typeUtil.exists)(titleContent)) {
88+
appliedTitleContent = /*#__PURE__*/_react.default.createElement("div", {
89+
style: {
90+
flexGrow: 1
91+
}
92+
}, titleContent);
93+
}
94+
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconContent, titleTextContent, appliedTitleContent, secondaryIconContent);
95+
};
96+
var renderMessage = function renderMessage() {
97+
var hasCustomClass = messageCardClasses && messageCardClasses.messageContentContainer;
98+
var injectedMessageContainerClass = hasCustomClass ? messageCardClasses.messageContentContainer : classes.messageContainer;
99+
if ((0, _typeUtil.exists)(messageContent)) {
100+
return /*#__PURE__*/_react.default.createElement("div", {
101+
className: injectedMessageContainerClass
102+
}, messageContent);
103+
}
104+
if ((0, _typeUtil.isStringNonEmpty)(message)) {
105+
return /*#__PURE__*/_react.default.createElement("div", {
106+
className: injectedMessageContainerClass
107+
}, /*#__PURE__*/_react.default.createElement(_Typography.default, {
108+
variant: "body2"
109+
}, message));
110+
}
111+
return null;
112+
};
113+
var content = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_CardContent.default, {
114+
className: "".concat(classes.startFlex, " ").concat(appliedTitleContentContainer)
115+
}, renderTitle()), renderMessage());
116+
return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_Card.default, {
117+
className: messageCardClasses.card
118+
}, content));
119+
};
120+
var _default = BaseMessageCard;
121+
exports.default = _default;

‎lib/components/Card/ErrorCard.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ var _Theme = _interopRequireDefault(require("../Theme/Theme"));
1212
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
1313
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
1414
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
15-
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
15+
function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } /* eslint-disable react/require-default-props */
1616
var useStyles = (0, _styles.makeStyles)(function (muiTheme) {
1717
return (
1818
// eslint-disable-next-line implicit-arrow-linebreak

0 commit comments

Comments
 (0)