Merge branch 'master' of github.com:cloudera/hue into feat/storage-br…

…owser-16

apps/beeswax/src/beeswax/migrations/0004_alter_compute_is_ready.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2025-01-09 11:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('beeswax', '0003_compute_namespace'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='compute',
+            name='is_ready',
+            field=models.BooleanField(default=True, null=True),
+        ),
+    ]

apps/beeswax/src/beeswax/models.py

@@ -651,7 +651,7 @@ class Compute(models.Model):
       default='sqlalchemy'
   )
   namespace = models.ForeignKey(Namespace, on_delete=models.CASCADE, null=True)
-  is_ready = models.BooleanField(default=True)
+  is_ready = models.BooleanField(default=True, null=True)
   external_id = models.CharField(max_length=255, null=True, db_index=True)
   ldap_groups_json = models.TextField(default='[]')
   settings = models.TextField(default='{}')

apps/filebrowser/src/filebrowser/api.py

@@ -734,7 +734,7 @@ def chown(request):
   path = request.POST.get('path')
   user = request.POST.get("user")
   group = request.POST.get("group")
-  recursive = request.POST.get('recursive', False)
+  recursive = coerce_bool(request.POST.get('recursive', False))
 
   # TODO: Check if we need to explicitly handle encoding anywhere
   request.fs.chown(path, user, group, recursive=recursive)

apps/oozie/src/oozie/conf.py

@@ -61,6 +61,13 @@
   ),
 )
 
+OOZIE_HS2_JDBC_URL = Config(
+    key="oozie_hs2_jdbc_url",
+    help="The JDBC URL for HiveServer2 action",
+    type=str,
+    default=""
+)
+
 
 def get_oozie_job_count():
   '''Returns the maximum of jobs fetched by the API depending on the Hue version'''

apps/oozie/src/oozie/models2.py

@@ -50,7 +50,7 @@
 from liboozie.oozie_api import get_oozie
 from liboozie.submission2 import Submission, create_directories
 from notebook.models import Notebook
-from oozie.conf import REMOTE_SAMPLE_DIR
+from oozie.conf import OOZIE_HS2_JDBC_URL, REMOTE_SAMPLE_DIR
 from oozie.importlib.workflows import InvalidTagWithNamespaceException, MalformedWfDefException, generate_v2_graph_nodes
 from oozie.utils import UTC_TIME_FORMAT, convert_to_server_timezone, utc_datetime_format
 
@@ -830,7 +830,7 @@ def to_xml(self, mapping=None, node_mapping=None, workflow_mapping=None):
       workflow_mapping = {}
 
     if self.data['type'] in ('hive2', 'hive-document') and not self.data['properties']['jdbc_url']:
-      self.data['properties']['jdbc_url'] = _get_hiveserver2_url()
+      self.data['properties']['jdbc_url'] = OOZIE_HS2_JDBC_URL.get() if OOZIE_HS2_JDBC_URL.get() else _get_hiveserver2_url()
 
     if self.data['type'] == 'fork':
       links = [link for link in self.data['children'] if link['to'] in node_mapping]

desktop/conf.dist/hue.ini

@@ -1689,6 +1689,9 @@ submit_to=True
 # Parameters are $TIME and $USER, e.g. /user/$USER/hue/workspaces/workflow-$TIME
 ## remote_data_dir=/user/hue/oozie/workspaces
 
+# JDBC URL for Hive2 action
+## oozie_hs2_jdbc_url=jdbc:hive2://localhost:10000/default
+
 # Maximum of Oozie workflows or coodinators to retrieve in one API call.
 ## oozie_jobs_count=100
 

desktop/conf/pseudo-distributed.ini.tmpl

@@ -1673,6 +1673,9 @@
   # Parameters are $TIME and $USER, e.g. /user/$USER/hue/workspaces/workflow-$TIME
   ## remote_data_dir=/user/hue/oozie/workspaces
 
+  # JDBC URL for Hive2 action
+  ## oozie_hs2_jdbc_url=jdbc:hive2://localhost:10000/default
+
   # Maximum of Oozie workflows or coodinators to retrieve in one API call.
   ## oozie_jobs_count=100
 

desktop/core/ext-py3/djangosaml2-0.18.0/djangosaml2/views.py

@@ -232,6 +232,7 @@ def login(request,
                     saml_request = base64.b64encode(binary_type(request_xml))
 
                 http_response = render(request, post_binding_form_template, {
+                    'request': request,
                     'target_url': location,
                     'params': {
                         'SAMLRequest': saml_request,

desktop/core/src/desktop/js/apps/editor/components/result/reactExample/ReactExample.tsx

@@ -14,7 +14,7 @@ import { Ace } from '../../../../../ext/ace';
 
 import { CURSOR_POSITION_CHANGED_EVENT } from '../../aceEditor/AceLocationHandler';
 import ReactExampleGlobal from '../../../../../reactComponents/ReactExampleGlobal/ReactExampleGlobal';
-import { useHuePubSub } from '../../../../../utils/hooks/useHuePubSub';
+import { useHuePubSub } from '../../../../../utils/hooks/useHuePubSub/useHuePubSub';
 import SqlExecutable from '../../../execution/sqlExecutable';
 
 import './ReactExample.scss';

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

@@ -25,7 +25,7 @@ import FileIcon from '@cloudera/cuix-core/icons/react/DocumentationIcon';
 
 import { i18nReact } from '../../../utils/i18nReact';
 import useDebounce from '../../../utils/useDebounce';
-import useLoadData from '../../../utils/hooks/useLoadData';
+import useLoadData from '../../../utils/hooks/useLoadData/useLoadData';
 
 import { BrowserViewType, ListDirectory } from '../../../reactComponents/FileChooser/types';
 import { LIST_DIRECTORY_API_URL } from '../../../reactComponents/FileChooser/api';

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

@@ -25,7 +25,7 @@ import StorageBrowserTab from './StorageBrowserTab/StorageBrowserTab';
 import { ApiFileSystem, FILESYSTEMS_API_URL } from '../../reactComponents/FileChooser/api';
 
 import './StorageBrowserPage.scss';
-import useLoadData from '../../utils/hooks/useLoadData';
+import useLoadData from '../../utils/hooks/useLoadData/useLoadData';
 import LoadingErrorWrapper from '../../reactComponents/LoadingErrorWrapper/LoadingErrorWrapper';
 
 const StorageBrowserPage = (): JSX.Element => {

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

@@ -23,7 +23,7 @@ import PathBrowser from '../../../reactComponents/PathBrowser/PathBrowser';
 import StorageDirectoryPage from '../StorageDirectoryPage/StorageDirectoryPage';
 import { FILE_STATS_API_URL } from '../../../reactComponents/FileChooser/api';
 import { BrowserViewType, FileStats } from '../../../reactComponents/FileChooser/types';
-import useLoadData from '../../../utils/hooks/useLoadData';
+import useLoadData from '../../../utils/hooks/useLoadData/useLoadData';
 
 import './StorageBrowserTab.scss';
 import StorageFilePage from '../StorageFilePage/StorageFilePage';

desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/CreateAndUploadAction/CreateAndUploadAction.test.tsx

@@ -8,7 +8,7 @@ import {
 } from '../../../../reactComponents/FileChooser/api';
 
 const mockSave = jest.fn();
-jest.mock('../../../../utils/hooks/useSaveData', () => ({
+jest.mock('../../../../utils/hooks/useSaveData/useSaveData', () => ({
   __esModule: true,
   default: jest.fn(() => ({
     save: mockSave

desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/CreateAndUploadAction/CreateAndUploadAction.tsx

@@ -31,7 +31,7 @@ import {
   CREATE_FILE_API_URL
 } from '../../../../reactComponents/FileChooser/api';
 import { FileStats } from '../../../../reactComponents/FileChooser/types';
-import useSaveData from '../../../../utils/hooks/useSaveData';
+import useSaveData from '../../../../utils/hooks/useSaveData/useSaveData';
 import InputModal from '../../InputModal/InputModal';
 import './CreateAndUploadAction.scss';
 import DragAndDrop from '../../../../reactComponents/DragAndDrop/DragAndDrop';

desktop/core/src/desktop/js/apps/storageBrowser/StorageDirectoryPage/StorageBrowserActions/ChangeOwnerAndGroupModal/ChangeOwnerAndGroupModal.scss

@@ -0,0 +1,59 @@
+// 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.
+
+@use 'variables' as vars;
+
+.antd.cuix {
+  .hue-change-owner-group {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    gap: 8px;
+
+    &__header-note {
+      padding: 8px;
+      background-color: vars.$fluidx-gray-200;
+      margin-bottom: 8px;
+    }
+
+    &__form {
+      display: flex;
+      flex-direction: column;
+      flex: 1;
+      gap: 16px;
+    }
+
+    &__entity {
+      display: flex;
+      flex-direction: column;
+    }
+
+    &__dropdown {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
+      grid-gap: 8px;
+    }
+
+    &__checkbox {
+      display: flex;
+      gap: 8px;
+    }
+
+    &__label {
+      color: vars.$fluidx-gray-700;
+    }
+  }
+}