Merge branch 'master' into master

desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/index.d.ts

@@ -82,3 +82,12 @@ export interface CounterDetails {
   counterName: string;
   counterValue: string;
 }
+
+export type CounterMetrics = { [key: string]: string };
+
+export type Profile = {
+  cpuMetrics: CounterMetrics;
+  hdfsMetrics: CounterMetrics;
+  memoryMetrics: CounterMetrics;
+  threadTimeMetrics: CounterMetrics;
+};

desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/query-details/QueryDetails.vue

@@ -76,7 +76,6 @@
   import CountersTable from './counters-table/CountersTable.vue';
 
   import { CounterDetails, CounterGroup, ImpalaQuery, ImpalaQueryProfile } from '../index';
-  import { hueWindow } from 'types/types';
   import huePubSub from 'utils/huePubSub';
 
   import I18n from 'utils/i18n';

desktop/core/src/desktop/js/apps/jobBrowser/components/impalaQueries/query-details/QueryDetailsDiff.vue

@@ -84,7 +84,7 @@
 
   import I18n from 'utils/i18n';
 
-  import { CounterDetails, CounterGroup, ImpalaQuery } from '../index';
+  import { CounterDetails, CounterGroup, ImpalaQuery, CounterMetrics, Profile } from '../index';
 
   import { get } from 'lodash';
 
@@ -122,8 +122,8 @@
     methods: {
       get,
       I18n,
-      getCounters: function (profile: any): CounterGroup[] {
-        const kvToCounters = (kv: any): CounterDetails[] => {
+      getCounters: function (profile: Profile): CounterGroup[] {
+        const kvToCounters = (kv: CounterMetrics): CounterDetails[] => {
           return Object.keys(kv).map(key => ({
             counterName: key,
             counterValue: kv[key]

desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage/StorageBrowserPage.tsx

@@ -49,6 +49,7 @@ const StorageBrowserPage: React.FC = (): JSX.Element => {
         })
         .catch(error => {
           //TODO: Properly handle errors.
+          console.error(error);
         })
         .finally(() => {
           setLoading(false);

desktop/core/src/desktop/js/apps/storageBrowser/StorageBrowserPage/StorageBrowserTabContents/StorageBrowserTabContent.tsx

@@ -129,6 +129,7 @@ const StorageBrowserTabContent: React.FC<StorageBrowserTabContentProps> = ({
       })
       .catch(error => {
         //TODO: handle errors
+        console.error(error);
       })
       .finally(() => {
         setloadingFiles(false);

desktop/core/src/desktop/js/reactComponents/FileChooser/FileChooserModal/FileChooserModal.tsx

@@ -78,6 +78,7 @@ const FileChooserModal: React.FC<FileProps> = ({ show, onCancel, title, okText }
         })
         .catch(error => {
           //TODO: Properly handle errors.
+          console.error(error);
         })
         .finally(() => {
           setLoading(false);
@@ -94,6 +95,7 @@ const FileChooserModal: React.FC<FileProps> = ({ show, onCancel, title, okText }
         })
         .catch(error => {
           //TODO: handle errors
+          console.error(error);
         })
         .finally(() => {
           setloadingFiles(false);

desktop/core/src/desktop/js/reactComponents/WelcomeTour/WelcomeTour.module.scss

@@ -0,0 +1,31 @@
+// Licensed to Cloudera, Inc. under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  Cloudera, Inc. licenses this file
+// to you under the Apache License, Version 2.0 (the
+// 'License'); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an 'AS IS' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+@import '../../components/styles/mixins';
+@import '../../components/styles/variables';
+
+/* stylelint-disable */
+:export {
+  primaryColor: $hue-primary-color-dark;
+  overlayColor: rgba($fluidx-black, 0.2);
+  tourZIndex: 2000;
+  borderRadius: $border-radius-base;
+  buttonFontSize: $font-size-base;
+  buttonPadding: 6px 12px;
+  buttonLineHeight: 20px;
+  backButtonBorder: 1px solid $fluidx-gray-300;
+}
+/* stylelint-enable */

desktop/core/src/desktop/js/reactComponents/WelcomeTour/WelcomeTour.scss

@@ -0,0 +1,26 @@
+// Licensed to Cloudera, Inc. under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  Cloudera, Inc. licenses this file
+// to you under the Apache License, Version 2.0 (the
+// 'License'); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an 'AS IS' BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+@import '../../components/styles/mixins';
+@import '../../components/styles/variables';
+
+.react-joyride__tooltip {
+  h3 {
+    font-size: $fluidx-heading-h3-size;
+    line-height: $fluidx-heading-h3-line-height;
+    font-weight: $fluidx-heading-h3-weight;
+  }
+}

desktop/core/src/desktop/js/reactComponents/WelcomeTour/WelcomeTour.test.tsx

@@ -0,0 +1,37 @@
+// Licensed to Cloudera, Inc. under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  Cloudera, Inc. licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React from 'react';
+import { act, render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+
+import huePubSub from 'utils/huePubSub';
+
+import WelcomeTour from './WelcomeTour';
+
+describe('WelcomeTour', () => {
+  test('it should show the welcome tour on huePubSub event', async () => {
+    render(<WelcomeTour />);
+    expect(screen.queryByText(/Welcome to Hue 4!/)).not.toBeInTheDocument();
+
+    await act(async () => {
+      huePubSub.publish('show.welcome.tour');
+      await new Promise(process.nextTick);
+    });
+
+    expect(screen.queryByText(/Welcome to Hue 4!/)).toBeInTheDocument();
+  });
+});

desktop/core/src/desktop/js/reactComponents/WelcomeTour/WelcomeTour.tsx

@@ -0,0 +1,224 @@
+// Licensed to Cloudera, Inc. under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  Cloudera, Inc. licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import React, { ReactNode, useState } from 'react';
+import Joyride from 'react-joyride';
+
+import { post } from 'api/utils';
+import { hueWindow } from 'types/types';
+import I18n from 'utils/i18n';
+import { useHuePubSub } from '../useHuePubSub';
+
+import './WelcomeTour.scss';
+import scssVariables from './WelcomeTour.module.scss';
+
+const {
+  backButtonBorder,
+  borderRadius,
+  buttonFontSize,
+  buttonLineHeight,
+  buttonPadding,
+  overlayColor,
+  primaryColor,
+  tourZIndex
+} = scssVariables;
+
+const getStepContent = (title?: ReactNode, text?: ReactNode) => (
+  <>
+    {title && <h3>{title}</h3>}
+    {text && <p>{text}</p>}
+  </>
+);
+
+const steps: Joyride.Step[] = [
+  {
+    content: getStepContent(
+      I18n('Welcome to Hue 4!'),
+      I18n('We want to introduce you to the new interface. It takes less than a minute. Ready?')
+    ),
+    target: 'body',
+    disableBeacon: true,
+    placement: 'center'
+  },
+  {
+    content: getStepContent(
+      I18n('A new top bar!'),
+      I18n('Do global search and view status of jobs and notifications on the right.')
+    ),
+    target: '.navbar-default',
+    disableBeacon: true,
+    placement: 'bottom'
+  },
+  {
+    content: getStepContent(
+      I18n('Sidebar for navigation'),
+      I18n('Open apps and browsers, get help and manage your user profile.')
+    ),
+    target: '.sidebar',
+    disableBeacon: true,
+    placement: 'right'
+  },
+  {
+    content: getStepContent(
+      I18n('Left Assist Panel'),
+      I18n(
+        'Discover data sources with the improved data assist panel. Remember to right-click items for more!'
+      )
+    ),
+    target: '.left-panel',
+    disableBeacon: true,
+    placement: 'right'
+  },
+  {
+    content: getStepContent(
+      undefined,
+      `${I18n('This is the main attraction, where your selected app runs.')}\n${I18n(
+        'Hover on the app name to star it as your favorite application.'
+      )}`
+    ),
+    target: '.page-content',
+    disableBeacon: true,
+    placement: 'bottom',
+    styles: {
+      tooltip: {
+        marginTop: '100px'
+      }
+    }
+  },
+  {
+    content: getStepContent(
+      I18n('Right Assist Panel'),
+      I18n(
+        'Some apps have a right panel with additional information to assist you in your data discovery.'
+      )
+    ),
+    target: '.right-panel',
+    disableBeacon: true,
+    placement: 'left'
+  },
+  {
+    content: (
+      <>
+        <p>
+          {I18n(
+            'This ends the tour. To see it again, click Welcome Tour from the help section in the sidebar.'
+          )}
+        </p>
+        <p>
+          {I18n('And now go ')}
+          <b>{I18n('Query, Explore, Repeat')}</b>!
+        </p>
+      </>
+    ),
+    target: 'body',
+    disableBeacon: true,
+    placement: 'center'
+  }
+];
+
+if ((window as hueWindow).USER_IS_ADMIN) {
+  steps.splice(3, 0, {
+    content: getStepContent(
+      I18n('Administration'),
+      I18n(
+        'As a superuser, you can check system configuration from the user menu and install sample data and jobs for your users.'
+      )
+    ),
+    target: '.server-position-pointer-welcome-tour',
+    disableBeacon: true,
+    placement: 'right-end'
+  });
+}
+
+const styles: Partial<Joyride.Styles> = {
+  options: {
+    overlayColor,
+    primaryColor,
+    zIndex: parseInt(tourZIndex) || 1 // the fallback to 1 is for testing where it doesn't pick up the scss vars properly
+  },
+  buttonBack: {
+    border: backButtonBorder,
+    borderRadius,
+    fontSize: buttonFontSize,
+    lineHeight: buttonLineHeight,
+    padding: buttonPadding
+  },
+  buttonNext: {
+    borderRadius,
+    fontSize: buttonFontSize,
+    lineHeight: buttonLineHeight,
+    padding: buttonPadding
+  },
+  tooltip: {
+    borderRadius
+  },
+  spotlight: {
+    borderRadius: 0
+  }
+};
+
+export const WelcomeTour = (): JSX.Element => {
+  const [run, setRun] = useState(false);
+  const [joyrideHelpers, setJoyrideHelpers] = useState<Joyride.StoreHelpers>();
+
+  useHuePubSub({
+    topic: 'show.welcome.tour',
+    callback: () => {
+      setRun(true);
+    }
+  });
+
+  const onStateChange: Joyride.Callback = ({ action }) => {
+    if (action === 'close' || action === 'reset') {
+      setRun(false);
+      if (joyrideHelpers) {
+        joyrideHelpers.reset(false);
+      }
+
+      // While migrating the old welcome tour I noticed that we no longer start the welcome tour
+      // automatically for new users, this was done intentionally in commit:
+      // https://github.com/cloudera/hue/commit/f54d0e23fa1105b1bbf8c2cd8f830c2835572be1
+      // The user preference is in place in the backend so if we ever want to revert that change
+      // we should uncomment the below code and set the initial "run" state based on the value
+      // of the preference.
+
+      // post('/desktop/api2/user_preferences/is_welcome_tour_seen', {
+      //   set: 'seen'
+      // });
+    }
+  };
+
+  return (
+    <Joyride
+      steps={steps}
+      run={run}
+      disableScrolling={true}
+      continuous={true}
+      spotlightPadding={0}
+      callback={onStateChange}
+      getHelpers={setJoyrideHelpers}
+      locale={{
+        back: I18n('Back'),
+        close: I18n('Close'),
+        last: I18n('Close'),
+        next: I18n('Next')
+      }}
+      styles={styles}
+    />
+  );
+};
+
+export default WelcomeTour;