@webiny/app-admin 5.18.2-beta.0 → 5.19.0-beta.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.
|
@@ -4,6 +4,7 @@ import { Typography } from "@webiny/ui/Typography";
|
|
|
4
4
|
import classSet from "classnames";
|
|
5
5
|
import webinyLogo from "../../assets/images/webiny-orange-logo.svg";
|
|
6
6
|
import signInDivider from "./assets/sign-in-divider.svg";
|
|
7
|
+
import { config as appConfig } from "@webiny/app/config";
|
|
7
8
|
var SidebarWrapper = /*#__PURE__*/styled("div", {
|
|
8
9
|
target: "eu74ttw0",
|
|
9
10
|
label: "SidebarWrapper"
|
|
@@ -139,11 +140,12 @@ var Sidebar = function Sidebar(_ref2) {
|
|
|
139
140
|
var installations = allInstallers.filter(function (installer) {
|
|
140
141
|
return installer.type === "install";
|
|
141
142
|
});
|
|
143
|
+
var wbyVersion = appConfig.getKey("WEBINY_VERSION", process.env.REACT_APP_WEBINY_VERSION);
|
|
142
144
|
return /*#__PURE__*/React.createElement(SidebarWrapper, null, /*#__PURE__*/React.createElement(Logo, null, /*#__PURE__*/React.createElement("img", {
|
|
143
145
|
src: webinyLogo,
|
|
144
146
|
alt: "Webiny CMS"
|
|
145
147
|
})), upgrades.length > 0 ? /*#__PURE__*/React.createElement(Installations, {
|
|
146
|
-
title: /*#__PURE__*/React.createElement("span", null, "The following apps will be upgraded to
|
|
148
|
+
title: /*#__PURE__*/React.createElement("span", null, "The following apps will be upgraded to ", /*#__PURE__*/React.createElement("strong", null, wbyVersion), ":"),
|
|
147
149
|
allInstallers: upgrades,
|
|
148
150
|
installer: installer,
|
|
149
151
|
showLogin: showLogin
|
|
@@ -11,18 +11,20 @@ import { Elevation } from "@webiny/ui/Elevation";
|
|
|
11
11
|
import { useInstaller } from "./useInstaller";
|
|
12
12
|
import Sidebar from "./Sidebar";
|
|
13
13
|
import { Wrapper, alertClass, InnerContent, InstallContent, installerSplitView, SuccessDialog } from "./styled";
|
|
14
|
+
import { config as appConfig } from "@webiny/app/config";
|
|
14
15
|
export var AppInstaller = function AppInstaller(_ref) {
|
|
15
16
|
var Authentication = _ref.Authentication,
|
|
16
17
|
children = _ref.children;
|
|
17
18
|
var tenantId = localStorage.get("webiny_tenant") || "root";
|
|
18
19
|
var lsKey = "webiny_installation_".concat(tenantId);
|
|
20
|
+
var wbyVersion = appConfig.getKey("WEBINY_VERSION", process.env.REACT_APP_WEBINY_VERSION);
|
|
19
21
|
|
|
20
22
|
var markInstallerAsCompleted = function markInstallerAsCompleted() {
|
|
21
|
-
localStorage.set(lsKey,
|
|
23
|
+
localStorage.set(lsKey, wbyVersion);
|
|
22
24
|
};
|
|
23
25
|
|
|
24
26
|
var isInstallerCompleted = function isInstallerCompleted() {
|
|
25
|
-
return localStorage.get(lsKey) ===
|
|
27
|
+
return localStorage.get(lsKey) === wbyVersion;
|
|
26
28
|
};
|
|
27
29
|
|
|
28
30
|
var _useState = useState(false),
|
|
@@ -11,6 +11,7 @@ import { sort, gt, lte } from "semver";
|
|
|
11
11
|
import { useApolloClient } from "@apollo/react-hooks";
|
|
12
12
|
import { plugins } from "@webiny/plugins";
|
|
13
13
|
import { CircularProgress } from "@webiny/ui/Progress";
|
|
14
|
+
import { config as appConfig } from "@webiny/app/config";
|
|
14
15
|
|
|
15
16
|
var Loader = function Loader(_ref) {
|
|
16
17
|
var children = _ref.children,
|
|
@@ -109,9 +110,10 @@ export var useInstaller = function useInstaller(_ref2) {
|
|
|
109
110
|
installed: false
|
|
110
111
|
});
|
|
111
112
|
} else {
|
|
113
|
+
var wbyVersion = appConfig.getKey("WEBINY_VERSION", process.env.REACT_APP_WEBINY_VERSION);
|
|
112
114
|
var upgrades = (installer.plugin.upgrades || []).filter(function (_ref5) {
|
|
113
115
|
var version = _ref5.version;
|
|
114
|
-
return lte(version,
|
|
116
|
+
return lte(version, wbyVersion) && gt(version, installer.installed);
|
|
115
117
|
});
|
|
116
118
|
|
|
117
119
|
if (upgrades.length > 1) {
|
|
@@ -90,7 +90,7 @@ var FileManagerPortal = /*#__PURE__*/function (_React$Component) {
|
|
|
90
90
|
};
|
|
91
91
|
|
|
92
92
|
if (images) {
|
|
93
|
-
props.accept = ["image/jpg", "image/jpeg", "image/gif", "image/png", "image/svg+xml"];
|
|
93
|
+
props.accept = ["image/jpg", "image/jpeg", "image/tiff", "image/gif", "image/png", "image/webp", "image/bmp", "image/svg+xml"];
|
|
94
94
|
} // Let's pass "permanent" / "persistent" / "temporary" flags as "mode" prop instead.
|
|
95
95
|
|
|
96
96
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webiny/app-admin",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.19.0-beta.0",
|
|
4
4
|
"main": "index.js",
|
|
5
5
|
"description": "A collection of plugins that together form a complete admin interface, customizable and extensible with Webiny apps and plugins.",
|
|
6
6
|
"repository": {
|
|
@@ -18,14 +18,14 @@
|
|
|
18
18
|
"@svgr/webpack": "4.3.3",
|
|
19
19
|
"@types/mime": "2.0.3",
|
|
20
20
|
"@types/react": "16.14.2",
|
|
21
|
-
"@webiny/app": "5.
|
|
22
|
-
"@webiny/app-security": "5.
|
|
23
|
-
"@webiny/form": "5.
|
|
24
|
-
"@webiny/plugins": "5.
|
|
25
|
-
"@webiny/react-router": "5.
|
|
26
|
-
"@webiny/ui": "5.
|
|
27
|
-
"@webiny/ui-composer": "5.
|
|
28
|
-
"@webiny/validation": "5.
|
|
21
|
+
"@webiny/app": "5.19.0-beta.0",
|
|
22
|
+
"@webiny/app-security": "5.19.0-beta.0",
|
|
23
|
+
"@webiny/form": "5.19.0-beta.0",
|
|
24
|
+
"@webiny/plugins": "5.19.0-beta.0",
|
|
25
|
+
"@webiny/react-router": "5.19.0-beta.0",
|
|
26
|
+
"@webiny/ui": "5.19.0-beta.0",
|
|
27
|
+
"@webiny/ui-composer": "5.19.0-beta.0",
|
|
28
|
+
"@webiny/validation": "5.19.0-beta.0",
|
|
29
29
|
"apollo-cache": "1.3.5",
|
|
30
30
|
"apollo-client": "2.6.10",
|
|
31
31
|
"apollo-link": "1.2.14",
|
|
@@ -63,8 +63,8 @@
|
|
|
63
63
|
"@babel/preset-env": "^7.5.5",
|
|
64
64
|
"@babel/preset-react": "^7.0.0",
|
|
65
65
|
"@babel/preset-typescript": "^7.8.3",
|
|
66
|
-
"@webiny/cli": "^5.
|
|
67
|
-
"@webiny/project-utils": "^5.
|
|
66
|
+
"@webiny/cli": "^5.19.0-beta.0",
|
|
67
|
+
"@webiny/project-utils": "^5.19.0-beta.0",
|
|
68
68
|
"babel-plugin-emotion": "^9.2.8",
|
|
69
69
|
"babel-plugin-lodash": "^3.3.4",
|
|
70
70
|
"babel-plugin-named-asset-import": "^1.0.0-next.3e165448",
|
|
@@ -97,5 +97,5 @@
|
|
|
97
97
|
]
|
|
98
98
|
}
|
|
99
99
|
},
|
|
100
|
-
"gitHead": "
|
|
100
|
+
"gitHead": "6c834e0b356e9099800f4094f2023b05b951d8ea"
|
|
101
101
|
}
|
|
@@ -12,6 +12,7 @@ import { UIElement } from "../../UIElement";
|
|
|
12
12
|
import { GenericElement } from "../../elements/GenericElement";
|
|
13
13
|
import { PlaceholderElement } from "../../elements/PlaceholderElement";
|
|
14
14
|
import { MenuFooter, subFooter } from "./Styled";
|
|
15
|
+
import { config as appConfig } from "@webiny/app/config";
|
|
15
16
|
export var FooterElement = /*#__PURE__*/function (_UIElement) {
|
|
16
17
|
_inherits(FooterElement, _UIElement);
|
|
17
18
|
|
|
@@ -29,11 +30,12 @@ export var FooterElement = /*#__PURE__*/function (_UIElement) {
|
|
|
29
30
|
_this.useGrid(false);
|
|
30
31
|
|
|
31
32
|
_this._footerPlaceholder = _this.addElement(new PlaceholderElement("navigation.footer.placeholder"));
|
|
33
|
+
var wbyVersion = appConfig.getKey("WEBINY_VERSION", process.env.REACT_APP_WEBINY_VERSION);
|
|
32
34
|
new GenericElement("webiny.version", function () {
|
|
33
35
|
return /*#__PURE__*/React.createElement(ListItem, {
|
|
34
36
|
ripple: false,
|
|
35
37
|
className: subFooter
|
|
36
|
-
}, "Webiny v",
|
|
38
|
+
}, "Webiny v", wbyVersion);
|
|
37
39
|
}).moveAfter(_this._footerPlaceholder);
|
|
38
40
|
return _this;
|
|
39
41
|
}
|