App Header React migration (#4245)

getredash · Oct 19, 2019 · a2e21dd · a2e21dd
1 parent f165cad
commit a2e21dd
Show file tree

Hide file tree

Showing 23 changed files with 553 additions and 623 deletions.
diff --git a/client/app/assets/less/ant.less b/client/app/assets/less/ant.less
@@ -47,6 +47,7 @@
 @zindex-dropdown: 2050;
 @zindex-picker: 2050;
 @zindex-tooltip: 2060;
+@item-hover-bg: #e5f8ff;
 
 .@{drawer-prefix-cls} {
   &.help-drawer {

diff --git a/client/app/assets/less/inc/base.less b/client/app/assets/less/inc/base.less
@@ -34,7 +34,7 @@ body {
           padding-bottom: 0;
         }
 
-        .nav.app-header, .navbar {
+        .app-header-wrapper {
             display: none;
         }
     }
@@ -187,7 +187,7 @@ text.slicetext {
     color: #111;
 }
 
-.profile__image--navbar {
+.profile__image--sidebar {
     border-radius: 100%;
     margin-right: 3px;
     margin-top: -2px;

diff --git a/client/app/assets/less/inc/navbar.less b/client/app/assets/less/inc/navbar.less
diff --git a/client/app/assets/less/main.less b/client/app/assets/less/main.less
@@ -44,7 +44,6 @@
 @import 'inc/profile';
 @import 'inc/404';
 @import 'inc/ie-warning';
-@import 'inc/navbar';
 @import 'inc/edit-in-place';
 @import 'inc/growl';
 @import 'inc/flex';

diff --git a/client/app/components/BeaconConsent.jsx b/client/app/components/BeaconConsent.jsx
@@ -4,7 +4,7 @@ import Card from 'antd/lib/card';
 import Button from 'antd/lib/button';
 import Typography from 'antd/lib/typography';
 import { clientConfig } from '@/services/auth';
-import { HelpTrigger } from '@/components/HelpTrigger';
+import HelpTrigger from '@/components/HelpTrigger';
 import DynamicComponent from '@/components/DynamicComponent';
 import OrgSettings from '@/services/organizationSettings';
 

diff --git a/client/app/components/CreateSourceDialog.jsx b/client/app/components/CreateSourceDialog.jsx
@@ -11,7 +11,7 @@ import { PreviewCard } from '@/components/PreviewCard';
 import EmptyState from '@/components/items-list/components/EmptyState';
 import DynamicForm from '@/components/dynamic-form/DynamicForm';
 import helper from '@/components/dynamic-form/dynamicFormHelper';
-import { HelpTrigger, TYPES as HELP_TRIGGER_TYPES } from '@/components/HelpTrigger';
+import HelpTrigger, { TYPES as HELP_TRIGGER_TYPES } from '@/components/HelpTrigger';
 
 const { Step } = Steps;
 const { Search } = Input;

diff --git a/client/app/components/EmailSettingsWarning.jsx b/client/app/components/EmailSettingsWarning.jsx
@@ -4,7 +4,7 @@ import cx from 'classnames';
 import { clientConfig, currentUser } from '@/services/auth';
 import Tooltip from 'antd/lib/tooltip';
 import Alert from 'antd/lib/alert';
-import { HelpTrigger } from '@/components/HelpTrigger';
+import HelpTrigger from '@/components/HelpTrigger';
 
 export default function EmailSettingsWarning({ featureName, className, mode, adminOnly }) {
   if (!clientConfig.mailSettingsMissing) {

diff --git a/client/app/components/HelpTrigger.jsx b/client/app/components/HelpTrigger.jsx
@@ -1,4 +1,3 @@
-import { react2angular } from 'react2angular';
 import React from 'react';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
@@ -80,9 +79,13 @@ export const TYPES = {
     '/user-guide/alerts/custom-alert-notifications',
     'Guide: Custom Alerts Notifications',
   ],
+  FAVORITES: [
+    '/user-guide/querying/favorites-tagging/#Favorites',
+    'Guide: Favorites',
+  ],
 };
 
-export class HelpTrigger extends React.Component {
+export default class HelpTrigger extends React.Component {
   static propTypes = {
     type: PropTypes.oneOf(Object.keys(TYPES)).isRequired,
     className: PropTypes.string,
@@ -236,9 +239,3 @@ export class HelpTrigger extends React.Component {
     );
   }
 }
-
-export default function init(ngModule) {
-  ngModule.component('helpTrigger', react2angular(HelpTrigger));
-}
-
-init.init = true;
diff --git a/client/app/components/ParameterMappingInput.jsx b/client/app/components/ParameterMappingInput.jsx
@@ -18,7 +18,7 @@ import Tooltip from 'antd/lib/tooltip';
 import ParameterValueInput from '@/components/ParameterValueInput';
 import { ParameterMappingType } from '@/services/widget';
 import { Parameter } from '@/services/query';
-import { HelpTrigger } from '@/components/HelpTrigger';
+import HelpTrigger from '@/components/HelpTrigger';
 
 import './ParameterMappingInput.less';