Merge branch 'master' into modal

Author: ananya-agarwal

apps/hive/src/hive/conf.py

@@ -74,7 +74,7 @@ def config_validator(user):
     from desktop.lib.fsmanager import get_filesystem
 
     if USE_STORAGE_CONNECTORS.get():
-      from desktop.lib.fs.s3.conf_utils import is_s3_enabled
+      from desktop.lib.fs.s3.conf_utils import is_enabled as is_s3_enabled
     else:
       from aws.conf import is_s3_enabled
 

desktop/core/src/desktop/js/apps/jobBrowser/knockout/JobBrowserViewModel.js

@@ -76,7 +76,7 @@ export default class JobBrowserViewModel {
         !this.isMini() && schedulerInterfaceCondition();
 
       const schedulerBeatInterfaceCondition = () =>
-        this.appConfig()?.scheduler?.interpreter_names.indexOf('celery-beat') !== -1;
+        this.appConfig()?.scheduler?.interpreter_names.includes('celery-beat');
 
       const livyInterfaceCondition = () =>
         !this.isMini() &&

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

@@ -83,7 +83,7 @@ const StorageBrowserTab = ({ fileSystem, testId }: StorageBrowserTabProps): JSX.
     error,
     reloadData
   } = useLoadData<FileStats, { path: string }, AxiosError>(FILE_STATS_API_URL, {
-    fetchOptions: { isRawError: true },
+    options: { isRawError: true },
     params: { path: filePath },
     skip: !filePath
   });

desktop/core/src/desktop/js/utils/hooks/useLoadData/useLoadData.ts

@@ -20,7 +20,7 @@ import { convertKeysToCamelCase } from '../../../utils/string/changeCasing';
 
 export interface Options<T, U, E> {
   params?: U;
-  fetchOptions?: ApiFetchOptions<T, E>;
+  options?: ApiFetchOptions<T, E>;
   skip?: boolean;
   onSuccess?: (data: T) => void;
   onError?: (error: E) => void;
@@ -44,7 +44,7 @@ const useLoadData = <T, U = unknown, E = string>(
   const [loading, setLoading] = useState<boolean>(false);
   const [error, setError] = useState<E>();
 
-  const fetchOptionsDefault: ApiFetchOptions<T, E> = {
+  const optionsDefault: ApiFetchOptions<T, E> = {
     silenceErrors: true,
     ignoreSuccessErrors: true
   };
@@ -72,8 +72,8 @@ const useLoadData = <T, U = unknown, E = string>(
       setError(undefined);
 
       const fetchOptions = {
-        ...fetchOptionsDefault,
-        ...localOptions?.fetchOptions
+        ...optionsDefault,
+        ...localOptions?.options
       };
 
       try {

desktop/core/src/desktop/lib/fs/s3/core/s3fs.py

@@ -213,7 +213,9 @@ def stats(self, path: Union[str, S3Path]) -> S3Stat:
     except FileNotFoundError:
       # Check if it's a prefix (directory)
       try:
-        response = self.s3_client.list_objects_v2(Bucket=path.bucket, Prefix=path.key, Delimiter=S3_DELIMITER, MaxKeys=1)
+        # For directory check, append '/' to avoid matching files that start with same prefix
+        directory_prefix = path.key.rstrip("/") + "/"
+        response = self.s3_client.list_objects_v2(Bucket=path.bucket, Prefix=directory_prefix, Delimiter=S3_DELIMITER, MaxKeys=1)
         if response.get("CommonPrefixes") or response.get("Contents"):
           return S3Stat.for_directory(path)
         raise FileNotFoundError(f"Path not found: {path}")

desktop/core/src/desktop/lib/fs/s3/core/upload.py

@@ -209,6 +209,4 @@ def _get_scheme(self):
     if self.destination:
       if "://" in self.destination:
         return self.destination.split("://")[0].upper()
-      else:
-        raise S3ConnectorUploadError("Destination does not have a valid scheme")
     return None