@griddo/ax 11.0.10-rc.0 → 11.0.11
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.
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@griddo/ax",
|
|
3
3
|
"description": "Griddo Author Experience",
|
|
4
|
-
"version": "11.0.
|
|
4
|
+
"version": "11.0.11",
|
|
5
5
|
"authors": [
|
|
6
6
|
"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
|
|
7
7
|
"Carlos Torres <carlos.torres@secuoyas.com>",
|
|
@@ -120,12 +120,12 @@
|
|
|
120
120
|
"postcss-normalize": "7.0.1",
|
|
121
121
|
"postcss-preset-env": "6.7.0",
|
|
122
122
|
"postcss-safe-parser": "^6.0.0",
|
|
123
|
-
"react": "
|
|
123
|
+
"react": "*",
|
|
124
124
|
"react-app-polyfill": "^1.0.4",
|
|
125
125
|
"react-beautiful-dnd": "^13.1.0",
|
|
126
126
|
"react-datepicker": "^3.2.2",
|
|
127
127
|
"react-dev-utils": "^11.0.4",
|
|
128
|
-
"react-dom": "
|
|
128
|
+
"react-dom": "*",
|
|
129
129
|
"react-draft-wysiwyg": "^1.14.5",
|
|
130
130
|
"react-error-boundary": "4.0.13",
|
|
131
131
|
"react-frame-component": "^5.2.1",
|
|
@@ -161,7 +161,8 @@
|
|
|
161
161
|
"webpack": "4.44.2",
|
|
162
162
|
"webpack-dev-server": "3.11.1",
|
|
163
163
|
"webpack-manifest-plugin": "2.2.0",
|
|
164
|
-
"workbox-webpack-plugin": "5.1.4"
|
|
164
|
+
"workbox-webpack-plugin": "5.1.4",
|
|
165
|
+
"yarn": "^1.22.11"
|
|
165
166
|
},
|
|
166
167
|
"devDependencies": {
|
|
167
168
|
"@babel/core": "^7.21.0",
|
|
@@ -221,8 +222,12 @@
|
|
|
221
222
|
"tsconfig.json",
|
|
222
223
|
"tsconfig.paths.json"
|
|
223
224
|
],
|
|
225
|
+
"peerDependencies": {
|
|
226
|
+
"react": "*",
|
|
227
|
+
"react-dom": "*"
|
|
228
|
+
},
|
|
224
229
|
"publishConfig": {
|
|
225
230
|
"access": "public"
|
|
226
231
|
},
|
|
227
|
-
"gitHead": "
|
|
232
|
+
"gitHead": "49cb33a4341a566dfd5aa3e8e13b9569a93586b7"
|
|
228
233
|
}
|
|
@@ -1,13 +1,25 @@
|
|
|
1
1
|
import React from "react";
|
|
2
2
|
import { Icon, ErrorToast } from "@ax/components";
|
|
3
|
+
import { IGlobalSettings } from "@ax/containers/App/reducer";
|
|
3
4
|
|
|
4
5
|
import * as S from "./style";
|
|
5
6
|
|
|
6
7
|
const LoginSSO = (props: ILoginSSOProps): JSX.Element => {
|
|
7
|
-
const { handleSSO, errorSSO } = props;
|
|
8
|
+
const { handleSSO, errorSSO, settings } = props;
|
|
8
9
|
|
|
9
10
|
const handleClick = () => handleSSO();
|
|
10
11
|
|
|
12
|
+
const welcomeText =
|
|
13
|
+
settings.SSOWelcomeText && settings.SSOWelcomeText.length ? (
|
|
14
|
+
settings.SSOWelcomeText
|
|
15
|
+
) : (
|
|
16
|
+
<>
|
|
17
|
+
To start using Griddo, login with your
|
|
18
|
+
<br />
|
|
19
|
+
autentication platform
|
|
20
|
+
</>
|
|
21
|
+
);
|
|
22
|
+
|
|
11
23
|
return (
|
|
12
24
|
<S.Wrapper>
|
|
13
25
|
<S.Main>
|
|
@@ -32,11 +44,7 @@ const LoginSSO = (props: ILoginSSOProps): JSX.Element => {
|
|
|
32
44
|
</>
|
|
33
45
|
) : (
|
|
34
46
|
<>
|
|
35
|
-
<S.Text>
|
|
36
|
-
To start using Griddo, login with your
|
|
37
|
-
<br />
|
|
38
|
-
autentication platform
|
|
39
|
-
</S.Text>
|
|
47
|
+
<S.Text>{welcomeText}</S.Text>
|
|
40
48
|
<S.StyledButton type="button" iconFill={false} onClick={handleClick}>
|
|
41
49
|
<S.ContentButton>
|
|
42
50
|
<S.IconButton>
|
|
@@ -62,6 +70,7 @@ const LoginSSO = (props: ILoginSSOProps): JSX.Element => {
|
|
|
62
70
|
interface ILoginSSOProps {
|
|
63
71
|
handleSSO: () => void;
|
|
64
72
|
errorSSO: string | null;
|
|
73
|
+
settings: IGlobalSettings;
|
|
65
74
|
}
|
|
66
75
|
|
|
67
76
|
export default LoginSSO;
|
|
@@ -50,7 +50,7 @@ const Login = (props: ILoginProps): JSX.Element => {
|
|
|
50
50
|
<S.LeftWrapper className={isLoginSuccess ? "animate" : ""} onAnimationEnd={_handleAnimationEnd} ref={wrapperRef}>
|
|
51
51
|
<S.LoginWrapper className={isLoginSuccess ? "animate" : ""} width={wrapperWidth}>
|
|
52
52
|
{settings.SSOActivated ? (
|
|
53
|
-
<LoginSSO handleSSO={handleSSO} errorSSO={errorSSO} />
|
|
53
|
+
<LoginSSO handleSSO={handleSSO} errorSSO={errorSSO} settings={settings} />
|
|
54
54
|
) : (
|
|
55
55
|
<LoginForm
|
|
56
56
|
handleSubmit={handleSubmit}
|
|
@@ -53,6 +53,7 @@ export interface IGlobalSettings {
|
|
|
53
53
|
autoSummary: boolean;
|
|
54
54
|
autoTranslation: boolean;
|
|
55
55
|
SSOActivated: boolean;
|
|
56
|
+
SSOWelcomeText: string;
|
|
56
57
|
}
|
|
57
58
|
|
|
58
59
|
export const initialState = {
|
|
@@ -84,6 +85,7 @@ export const initialState = {
|
|
|
84
85
|
autoSummary: false,
|
|
85
86
|
autoTranslation: false,
|
|
86
87
|
SSOActivated: false,
|
|
88
|
+
SSOWelcomeText: "",
|
|
87
89
|
},
|
|
88
90
|
sessionStartedAt: null,
|
|
89
91
|
hasAnimation: false,
|