Add sso error (#846)

* Add error type * Some fixes * Fixes
datalens-tech · Apr 12, 2024 · 0db11d4 · 0db11d4
1 parent 91ac4de
commit 0db11d4
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 20 deletions.
diff --git a/src/shared/constants/error-codes.ts b/src/shared/constants/error-codes.ts
@@ -50,4 +50,5 @@ export const ErrorContentTypes = {
     NEW_LOCAL_FEDERATION_USER: 'new-local-federation-user',
     INACCESSIBLE_ON_MOBILE: 'inaccessible-on-mobile',
     NOT_AUTHENTICATED: 'not-authenticated',
+    FORBIDDEN_SSO: 'forbidden-sso',
 };
diff --git a/src/shared/types/common.ts b/src/shared/types/common.ts
@@ -23,6 +23,7 @@ export type Lang = 'en' | 'ru';
 export interface LandingLayoutPageError {
     errorType: string;
     title?: string;
+    isHtmlInTitle?: boolean;
     description?: string;
     pageTitle?: RenderParams<{DL: DLGlobalData}>['title'];
     pageMeta?: RenderParams<{DL: DLGlobalData}>['meta'];

diff --git a/src/ui/components/ErrorContent/ErrorContent.js b/src/ui/components/ErrorContent/ErrorContent.js
@@ -26,6 +26,7 @@ class ErrorContent extends React.PureComponent {
     static propTypes = {
         className: PropTypes.string,
         title: PropTypes.string,
+        isHtmlInTitle: PropTypes.bool,
         description: PropTypes.node,
         type: PropTypes.oneOf(Object.values(ErrorContentTypes)),
         action: PropTypes.shape({
@@ -98,13 +99,17 @@ class ErrorContent extends React.PureComponent {
     }
 
     renderTitle() {
-        const {title = i18n('label_error-general'), hideTitle} = this.props;
+        const {title = i18n('label_error-general'), isHtmlInTitle = false, hideTitle} = this.props;
 
         if (hideTitle) {
             return null;
         }
 
-        return <div className={b('title')}>{title}</div>;
+        if (isHtmlInTitle) {
+            return <div className={b('title')} dangerouslySetInnerHTML={{__html: title}}></div>;
+        } else {
+            return <div className={b('title')}>{title}</div>;
+        }
     }
 
     renderDescription() {
@@ -258,6 +263,7 @@ class ErrorContent extends React.PureComponent {
             case ErrorContentTypes.CLOUD_FOLDER_ACCESS_DENIED:
             case ErrorContentTypes.NO_ENTRY_ACCESS:
             case ErrorContentTypes.AUTH_DENIED:
+            case ErrorContentTypes.FORBIDDEN_SSO:
                 imageName = 'noAccess';
                 break;
             case ErrorContentTypes.ERROR:

diff --git a/src/ui/components/ErrorContent/ErrorContent.scss b/src/ui/components/ErrorContent/ErrorContent.scss
@@ -20,6 +20,14 @@
         #{$class}__title {
             width: 100%;
             text-align: center;
+
+            a {
+                color: var(--g-color-text-link);
+
+                &:visited {
+                    color: var(--g-color-text-link);
+                }
+            }
         }
 
         #{$class}__description {
@@ -64,6 +72,14 @@
         font-weight: 500;
         font-size: var(--g-text-header-1-font-size);
         line-height: var(--g-text-header-1-line-height);
+
+        a {
+            color: var(--g-color-text-link);
+
+            &:visited {
+                color: var(--g-color-text-link);
+            }
+        }
     }
 
     &__content {

diff --git a/src/ui/components/Navigation/Base/NavigationBase.js b/src/ui/components/Navigation/Base/NavigationBase.js
@@ -296,24 +296,8 @@ class NavigationBase extends React.Component {
                 break;
             }
             case CreateMenuValue.Connection: {
-                if (this.props.isOnlyCollectionsMode) {
-                    this.props.openDialog({
-                        id: DIALOG_CREATE_ENTRY_IN_WORKBOOK,
-                        props: {
-                            initialCollectionId: null,
-                            entryType: 'connection',
-                            onApply: () => {
-                                this.closeNavigation();
-                            },
-                            onClose: () => {
-                                this.props.closeDialog();
-                            },
-                        },
-                    });
-                } else {
-                    history.push(`/connections/new${query}`);
-                    this.closeNavigation();
-                }
+                history.push(`/connections/new${query}`);
+                this.closeNavigation();
                 break;
             }
             case CreateMenuValue.Dataset: {

diff --git a/src/ui/store/reducers/asideHeader.ts b/src/ui/store/reducers/asideHeader.ts
@@ -32,6 +32,7 @@ const TypesHeaderWithoutNavigation = [
     ErrorContentTypes.AUTH_DENIED,
     ErrorContentTypes.NOT_FOUND_BY_RESOLVE_TENANT,
     ErrorContentTypes.NOT_AUTHENTICATED,
+    ErrorContentTypes.FORBIDDEN_SSO,
 ];
 
 export function getLandingNavigationSettings() {