orc-shared 5.10.1-dev.0 → 5.10.1-dev.2

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 (4) hide show
  1. package/dist/components/AppFrame/MenuItem.js +1 -1
  2. package/package.json +2 -2
  3. package/src/components/AppFrame/MenuItem.js +3 -1
  4. package/src/components/AppFrame/MenuItem.test.js +49 -40
package/dist/components/AppFrame/MenuItem.js CHANGED
@@ -167,7 +167,7 @@ var MenuItem = function MenuItem(_ref2) {
167
167
  className: "".concat(classes.alert, " ").concat(showAlert ? "show" : undefined)
168
168
  }, /*#__PURE__*/_react.default.createElement("div", {
169
169
  className: "".concat(classes.alertMessage, " ").concat(showAlertMessage ? "show" : undefined)
170
- }, alertMessage.current)), /*#__PURE__*/_react.default.createElement("span", {
170
+ }, alertMessage.current && /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, alertMessage.current))), /*#__PURE__*/_react.default.createElement("span", {
171
171
  className: classes.label
172
172
  }, typeof label === "string" ? label : /*#__PURE__*/_react.default.createElement(_reactIntl.FormattedMessage, label)));
173
173
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "orc-shared",
3
- "version": "5.10.1-dev.0",
3
+ "version": "5.10.1-dev.2",
4
4
  "description": "Shared code for Orckestra applications",
5
5
  "main": "./src/index.js",
6
6
  "exports": {
@@ -56,7 +56,7 @@
56
56
  "@testing-library/react": "^10.4.9"
57
57
  },
58
58
  "dependencies": {
59
- "orc-scripts": "4.0.7",
59
+ "orc-scripts": "4.0.8",
60
60
  "react-number-format": "^5.3.0"
61
61
  },
62
62
  "sideEffects": false,
package/src/components/AppFrame/MenuItem.js CHANGED
@@ -118,7 +118,9 @@ const MenuItem = ({ open = false, label = "", icon, alert, isHidden = false, hre
118
118
  <ItemWrapper to={href} className={classes.block} {...props}>
119
119
  <Icon id={icon} className={classes.menuIcon} />
120
120
  <div className={`${classes.alert} ${showAlert ? "show" : undefined}`}>
121
- <div className={`${classes.alertMessage} ${showAlertMessage ? "show" : undefined}`}>{alertMessage.current}</div>
121
+ <div className={`${classes.alertMessage} ${showAlertMessage ? "show" : undefined}`}>
122
+ {alertMessage.current && <FormattedMessage {...alertMessage.current} />}
123
+ </div>
122
124
  </div>
123
125
  <span className={classes.label}>{typeof label === "string" ? label : <FormattedMessage {...label} />}</span>
124
126
  </ItemWrapper>
package/src/components/AppFrame/MenuItem.test.js CHANGED
@@ -7,6 +7,7 @@ import { Link } from "react-router-dom";
7
7
  import Icon from "../MaterialUI/DataDisplay/Icon";
8
8
  import sharedMessages from "./../../sharedMessages";
9
9
  import { extractMessages, TestWrapper } from "./../../utils/testUtils";
10
+ import { IntlProvider } from "react-intl";
10
11
 
11
12
  const messages = extractMessages(sharedMessages);
12
13
 
@@ -131,10 +132,12 @@ describe("MenuItem", () => {
131
132
 
132
133
  it("shows activity message", () =>
133
134
  expect(
134
- <Provider store={store}>
135
- <MemoryRouter>
136
- <MenuItem id="test" href="/foo/test" icon="cake" label="Test" alert={{ message: "Test message" }} />
137
- </MemoryRouter>
135
+ <Provider store={store} intlProvider={{ messages }}>
136
+ <IntlProvider locale="en-US" timeZone="UTC" messages={messages}>
137
+ <MemoryRouter>
138
+ <MenuItem id="test" href="/foo/test" icon="cake" label="Test" alert={{ message: sharedMessages.about }} />
139
+ </MemoryRouter>
140
+ </IntlProvider>
138
141
  </Provider>,
139
142
  "when mounted",
140
143
  "to satisfy",
@@ -142,7 +145,7 @@ describe("MenuItem", () => {
142
145
  <Link id="test" to="/foo/test">
143
146
  <Icon id="cake" />
144
147
  <div>
145
- <div className="show">Test message</div>
148
+ <div className="show">About</div>
146
149
  </div>
147
150
  <span>Test</span>
148
151
  </Link>
@@ -152,15 +155,17 @@ describe("MenuItem", () => {
152
155
  it("shows activity type on messages", () =>
153
156
  expect(
154
157
  <Provider store={store}>
155
- <MemoryRouter>
156
- <MenuItem
157
- id="test"
158
- href="/foo/test"
159
- icon="cake"
160
- label="Test"
161
- alert={{ message: "Test message", type: "warn" }}
162
- />
163
- </MemoryRouter>
158
+ <IntlProvider locale="en-US" timeZone="UTC" messages={messages}>
159
+ <MemoryRouter>
160
+ <MenuItem
161
+ id="test"
162
+ href="/foo/test"
163
+ icon="cake"
164
+ label="Test"
165
+ alert={{ message: sharedMessages.about, type: "warn" }}
166
+ />
167
+ </MemoryRouter>
168
+ </IntlProvider>
164
169
  </Provider>,
165
170
  "when mounted",
166
171
  "to satisfy",
@@ -168,7 +173,7 @@ describe("MenuItem", () => {
168
173
  <Link id="test" to="/foo/test">
169
174
  <Icon id="cake" />
170
175
  <div>
171
- <div className="show">Test message</div>
176
+ <div className="show">About</div>
172
177
  </div>
173
178
  <span>Test</span>
174
179
  </Link>
@@ -178,16 +183,18 @@ describe("MenuItem", () => {
178
183
  it("shows nothing if isHidden is true", () => {
179
184
  expect(
180
185
  <Provider store={store}>
181
- <MemoryRouter>
182
- <MenuItem
183
- id="test"
184
- href="/foo/test"
185
- icon="cake"
186
- label="Test"
187
- alert={{ message: "Test message", type: "warn" }}
188
- isHidden={true}
189
- />
190
- </MemoryRouter>
186
+ <IntlProvider locale="en-US" timeZone="UTC" messages={messages}>
187
+ <MemoryRouter>
188
+ <MenuItem
189
+ id="test"
190
+ href="/foo/test"
191
+ icon="cake"
192
+ label="Test"
193
+ alert={{ message: sharedMessages.about, type: "warn" }}
194
+ isHidden={true}
195
+ />
196
+ </MemoryRouter>
197
+ </IntlProvider>
191
198
  </Provider>,
192
199
  "when mounted",
193
200
  "to equal",
@@ -204,8 +211,8 @@ describe("MenuItem", () => {
204
211
  id="test"
205
212
  href="/foo/test"
206
213
  icon="cake"
207
- label={{ id: "Test", defaultMessage: "Test" }}
208
- alert={{ message: "Test message", type: "warn" }}
214
+ label={sharedMessages.help}
215
+ alert={{ message: sharedMessages.about, type: "warn" }}
209
216
  hide={hide}
210
217
  />
211
218
  </TestWrapper>,
@@ -215,9 +222,9 @@ describe("MenuItem", () => {
215
222
  <Link id="test" to="/foo/test">
216
223
  <Icon id="cake" />
217
224
  <div>
218
- <div className="show">Test message</div>
225
+ <div className="show">About</div>
219
226
  </div>
220
- <span>Test</span>
227
+ <span>Help</span>
221
228
  </Link>
222
229
  </TestWrapper>,
223
230
  );
@@ -226,16 +233,18 @@ describe("MenuItem", () => {
226
233
  it("shows properly if hide is undefined", () => {
227
234
  expect(
228
235
  <Provider store={store}>
229
- <MemoryRouter>
230
- <MenuItem
231
- id="test"
232
- href="/foo/test"
233
- icon="cake"
234
- label="Test"
235
- alert={{ message: "Test message", type: "warn" }}
236
- hide={undefined}
237
- />
238
- </MemoryRouter>
236
+ <IntlProvider locale="en-US" timeZone="UTC" messages={messages}>
237
+ <MemoryRouter>
238
+ <MenuItem
239
+ id="test"
240
+ href="/foo/test"
241
+ icon="cake"
242
+ label="Test"
243
+ alert={{ message: sharedMessages.about, type: "warn" }}
244
+ hide={undefined}
245
+ />
246
+ </MemoryRouter>
247
+ </IntlProvider>
239
248
  </Provider>,
240
249
  "when mounted",
241
250
  "to satisfy",
@@ -243,7 +252,7 @@ describe("MenuItem", () => {
243
252
  <Link id="test" to="/foo/test">
244
253
  <Icon id="cake" />
245
254
  <div>
246
- <div className="show">Test message</div>
255
+ <div className="show">About</div>
247
256
  </div>
248
257
  <span>Test</span>
249
258
  </Link>