Skip to content

Commit c1ed8db

Browse files
yoandrypayoandrypa
committed
Merge remote-tracking branch 'origin/development' into development
2 parents b813edc + 3830ff0 commit c1ed8db

19 files changed

+1459
-1879
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,3 @@ yarn-error.log*
3434

3535
.eslintcache
3636

37-
yarn.lock

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ WORKDIR /app
55
ENV PATH /app/node_modules/.bin:$PATH
66
COPY package.json .
77
COPY package-lock.json .
8-
RUN npm install -g npm@latest
8+
RUN npm install -g npm@latestss
99
RUN npm ci --legacy-peer-deps
1010
RUN npm install react-scripts --production -g --silent
1111
COPY env.sh .

‎package-lock.json

+1,399-1,844
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+10-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6+
"@date-io/core": "^1.3.6",
67
"@date-io/date-fns": "^1.3.13",
7-
"@material-ui/core": "^4.11.2",
8-
"@material-ui/icons": "^5.0.0-alpha.36",
9-
"@material-ui/lab": "^4.0.0-alpha.57",
10-
"@material-ui/pickers": "^3.2.10",
8+
"@material-ui/core": "^4.12.4",
9+
"@material-ui/icons": "^4.11.3",
10+
"@material-ui/lab": "^4.0.0-alpha.61",
11+
"@material-ui/pickers": "^3.3.10",
1112
"@react-hook/resize-observer": "^1.1.2",
1213
"axios": "^0.27.2",
1314
"caret-pos": "^2.0.0",
@@ -21,21 +22,22 @@
2122
"file-saver": "^2.0.5",
2223
"htmlhint": "^0.14.2",
2324
"liquidjs": "^9.19.0",
24-
"material-ui-image": "^3.3.1",
25+
"material-ui-image": "^3.3.2",
2526
"mime-types": "^2.1.27",
2627
"moment": "^2.29.4",
2728
"object-hash": "^2.1.1",
2829
"pluralize": "^8.0.0",
2930
"pretty-bytes": "^5.6.0",
31+
"prop-types": "^15.6.0",
3032
"query-string": "^6.13.7",
31-
"react": "^16.14.0",
33+
"react": "^17.0.2",
3234
"react-async-script-loader": "^0.3.0",
33-
"react-dom": "^16.14.0",
35+
"react-dom": "^17.0.2",
3436
"react-dropzone": "^11.2.4",
3537
"react-input-autosize": "^3.0.0",
3638
"react-scripts": "4.0.1",
3739
"react-sortablejs": "^6.0.0",
38-
"react-swipeable-views": "^0.13.9",
40+
"react-swipeable-views": "^0.14.0",
3941
"rxjs": "^6.6.3",
4042
"sortablejs": "^1.12.0"
4143
},

‎src/actions/AccessTokens.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ import TableCell from "@material-ui/core/TableCell";
1616
import withStyles from "@material-ui/core/styles/withStyles";
1717
import IconButton from "@material-ui/core/IconButton";
1818
import DeleteIcon from "@material-ui/icons/Delete";
19-
import CopyIcon from "@material-ui/icons/ContentCopy";
19+
// import CopyIcon from "@material-ui/icons/ContentCopy";
20+
import CopyIcon from '@material-ui/icons/FileCopyOutlined';
2021
import ExpirationDateTimeViewer from "../viewers/ExpirationDateTimeViewer";
2122
import copy from 'copy-to-clipboard/index';
2223
import { of } from "rxjs";

‎src/actions/MetaConfig.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import { Config, FETCHED } from "../common/Symbols";
1010
import { map, switchMap, tap } from "rxjs/operators";
1111
import { FormRootValue } from "../services/FormValue";
1212
import { underscore } from "../common/strutls";
13-
import MetaConfigIcon from "@material-ui/icons/AutoFixHigh";
13+
// import MetaConfigIcon from "@material-ui/icons/AutoFixHigh";
14+
import MetaConfigIcon from '@material-ui/icons/SettingsEthernetOutlined';
1415
import Random from "../util/Random";
1516
import { of } from "rxjs";
1617
import EmbeddedAppService from "../services/EnbeddedAppService";

‎src/components/CodeMirrorControl.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import DialogContent from "@material-ui/core/DialogContent";
1717
import DialogTitle from '@material-ui/core/DialogTitle';
1818
import useTheme from "@material-ui/core/styles/useTheme";
1919
import ErrorMessages from "./ErrorMessages";
20-
import OpenInIcon from "@material-ui/icons/OpenInFullOutlined";
21-
import OpenInOffIcon from "@material-ui/icons/CloseFullscreenOutlined";
20+
// import OpenInIcon from "@material-ui/icons/OpenInFullOutlined";
21+
import OpenInIcon from '@material-ui/icons/Fullscreen';
22+
// import OpenInOffIcon from "@material-ui/icons/CloseFullscreenOutlined";
23+
import OpenInOffIcon from '@material-ui/icons/FullscreenExit';
2224

2325
const useStyles = makeStyles(theme => ({
2426
editor: {

‎src/components/UserCard.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { logout, appRequest, getAccess } from "../services/AuthorizationService"
55
import List from "@material-ui/core/List";
66
import ListItemIcon from "@material-ui/core/ListItemIcon";
77
import { useTenantContext } from "../layout/TenantContext";
8-
import LogoutIcon from "@material-ui/icons/Logout";
8+
import LogoutIcon from '@material-ui/icons/ExitToAppOutlined';
99
import PasswordIcon from '@material-ui/icons/VpnKey';
1010
import OkIcon from '@material-ui/icons/Check';
1111
import FailIcon from '@material-ui/icons/CancelOutlined';

‎src/config/Menu.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ import ProviderIcon from "../icons/ProviderIcon";
3333
import OauthScopesIcon from "../icons/OauthScopesIcon";
3434
import WorkflowIcon from "../icons/WorkflowIcon";
3535
import ResourceIcon from "@material-ui/icons/WorkOutline";
36-
import TraceIcon from "@material-ui/icons/HistoryToggleOff";
36+
// import TraceIcon from "@material-ui/icons/HistoryToggleOff";
37+
import TraceIcon from '@material-ui/icons/ToggleOffOutlined';
3738
import SvgIcon from "@material-ui/core/SvgIcon";
3839
import NamespaceIcon from "@material-ui/icons/DnsOutlined";
3940
import ConfigIcon from "@material-ui/icons/Settings";
40-
import AdministrationIcon from "@material-ui/icons/AdminPanelSettingsOutlined";
41+
// import AdministrationIcon from "@material-ui/icons/AdminPanelSettingsOutlined";
42+
import AdministrationIcon from '@material-ui/icons/SettingsOutlined';
4143
import { RoleMenuIcon } from "./dataTypes/Role";
4244
import { UserMenuIcon } from "./dataTypes/User";
4345
import { ScriptMenuIcon } from "./dataTypes/Script";

‎src/config/dataTypes/Cenit/Stripe/ExcludingGroup.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
2-
import PlanIcon from "@material-ui/icons/RequestQuote";
3-
import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
2+
// import PlanIcon from "@material-ui/icons/RequestQuote";
3+
import PlanIcon from '@material-ui/icons/MonetizationOn';
4+
// import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
5+
import MenuIcon from '@material-ui/icons/MonetizationOnOutlined';
46

57
const fields = ['name', 'plans'];
68

‎src/config/dataTypes/Cenit/Stripe/LicensedPlan.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
2-
import PlanIcon from "@material-ui/icons/RequestQuote";
3-
import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
2+
// import PlanIcon from "@material-ui/icons/RequestQuote";
3+
import PlanIcon from '@material-ui/icons/MonetizationOn';
4+
// import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
5+
import MenuIcon from '@material-ui/icons/MonetizationOnOutlined';
46

57
const fields = ['id', 'nickname', 'product', 'interval', 'currency', 'amount', 'summary', 'description', 'enabled'];
68

‎src/config/dataTypes/Cenit/Stripe/MeteredPlan.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
2-
import PlanIcon from "@material-ui/icons/RequestQuote";
3-
import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
2+
// import PlanIcon from "@material-ui/icons/RequestQuote";
3+
import PlanIcon from '@material-ui/icons/MonetizationOn';
4+
// import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
5+
import MenuIcon from '@material-ui/icons/MonetizationOnOutlined';
46

57
const fields = ['id', 'nickname', 'product', 'interval', 'currency', 'amount', 'summary', 'description', 'enabled'];
68

‎src/config/dataTypes/Cenit/Stripe/Plan.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
2-
import PlanIcon from "@material-ui/icons/RequestQuote";
3-
import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
2+
// import PlanIcon from "@material-ui/icons/RequestQuote";
3+
import PlanIcon from '@material-ui/icons/MonetizationOn';
4+
// import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
5+
import MenuIcon from '@material-ui/icons/MonetizationOnOutlined';
46

57
const fields = ['id', 'nickname', 'product', 'interval', 'currency', 'amount'];
68

‎src/config/dataTypes/Cenit/Stripe/SubscriptionGroup.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import React from 'react';
2-
import PlanIcon from "@material-ui/icons/RequestQuote";
3-
import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
2+
// import PlanIcon from "@material-ui/icons/RequestQuote";
3+
import PlanIcon from '@material-ui/icons/MonetizationOn';
4+
// import MenuIcon from "@material-ui/icons/RequestQuoteOutlined";
5+
import MenuIcon from '@material-ui/icons/MonetizationOnOutlined';
46

57
const fields = ['name', 'plans'];
68

‎src/config/dataTypes/Mongoid/Tracer/Trace.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import React from 'react';
22
import TraceActionViewer from "../../../../viewers/TraceActionViewer";
33
import { CRUD } from "../../../../actions/ActionRegistry";
44
import ChangesSetControl from "../../../../components/ChangesSetControl";
5-
import TraceIcon from "@material-ui/icons/HistoryToggleOff";
5+
// import TraceIcon from "@material-ui/icons/HistoryToggleOff";
6+
import TraceIcon from '@material-ui/icons/ToggleOffOutlined';
67
import ViewerControl from "../../../../components/ViewerControl";
78
import recordViewer from "../../../../viewers/recordViewer";
89

‎src/config/dataTypes/RabbitConsumer.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import React from 'react';
22
import { CRUD } from "../../actions/ActionRegistry";
33

4-
import RabbitConsumerIcon from '@material-ui/icons/RunCircle';
5-
import MenuIcon from '@material-ui/icons/RunCircleOutlined';
4+
// import RabbitConsumerIcon from '@material-ui/icons/RunCircle';
5+
import RabbitConsumerIcon from '@material-ui/icons/PlayCircleFilledWhite';
6+
// import MenuIcon from '@material-ui/icons/RunCircleOutlined';
7+
import MenuIcon from '@material-ui/icons/PlayCircleFilledWhiteOutlined';
68

79
export const RabbitConsumerMenuIcon = MenuIcon;
810

‎src/config/dataTypes/Setup/EmailNotification.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
2-
import EmailNotificationIcon from "@material-ui/icons/ForwardToInbox";
2+
// import EmailNotificationIcon from "@material-ui/icons/ForwardToInbox";
3+
import EmailNotificationIcon from '@material-ui/icons/MailOutline';
34
import { arrayDiff } from "../../../common/arrays";
45
import API from "../../../services/ApiService";
56
import { map } from "rxjs/operators";

‎src/config/dataTypes/Setup/Task.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@ import React from 'react';
22
import { CRUD } from "../../../actions/ActionRegistry";
33
import ErrorLevelViewer from "../../../viewers/ErrorLevelViewer";
44
import InfoIcon from "@material-ui/icons/Info";
5-
import PendingIcon from "@material-ui/icons/PendingActions";
6-
import RunningIcon from "@material-ui/icons/RunCircle";
5+
// import PendingIcon from "@material-ui/icons/PendingActions";
6+
import PendingIcon from '@material-ui/icons/UpdateOutlined';
7+
// import RunningIcon from "@material-ui/icons/RunCircle";
8+
import RunningIcon from '@material-ui/icons/DirectionsRunOutlined';
79
import FailedIcon from "@material-ui/icons/HighlightOff";
810
import CompletedIcon from "@material-ui/icons/AssignmentTurnedIn";
911
import RetryingIcon from "@material-ui/icons/Replay";
1012
import BrokenIcon from "@material-ui/icons/BrokenImage";
11-
import UnscheduleIcon from "@material-ui/icons/UpdateDisabled";
13+
// import UnscheduleIcon from "@material-ui/icons/UpdateDisabled";
14+
import UnscheduleIcon from '@material-ui/icons/NotInterested';
1215
import PausedIcon from "@material-ui/icons/PauseCircleOutline";
1316
import SvgIcon from "@material-ui/core/SvgIcon";
1417

‎src/layout/AppBar.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import { useSpreadState } from "../common/hooks";
2727
import NotificationsIcon from "../icons/NotificationsIcon";
2828
import { TaskMenuIcon } from "../config/dataTypes/Setup/Task";
2929
import Badge from "@material-ui/core/Badge";
30-
import NotificationIcon from '@material-ui/icons/CircleNotifications';
30+
// import NotificationIcon from '@material-ui/icons/CircleNotifications';
31+
import NotificationIcon from '@material-ui/icons/NotificationsActiveOutlined';
3132
import session from '../util/session';
3233

3334
const USER_NOTIFIED = 'USER_NOTIFIED';

0 commit comments

Comments
 (0)