fix: BROS-193: Follow up fixes

label_studio/io_storages/api.py

@@ -161,6 +161,7 @@ def create(self, request, *args, **kwargs):
 class ImportStorageListFilesAPI(generics.CreateAPIView):
 
     permission_required = all_permissions.projects_change
+    permission_classes = api_settings.DEFAULT_PERMISSION_CLASSES + [StoragePermission]
     parser_classes = (JSONParser, FormParser, MultiPartParser)
     serializer_class = None  # Default serializer
 

web/apps/labelstudio/src/components/Error/Error.jsx

@@ -19,6 +19,7 @@ export const ErrorWrapper = ({
   onGoBack,
   onReload,
   possum = false,
+  minimal = false,
 }) => {
   const preparedStackTrace = useMemo(() => {
     return (stacktrace ?? "").trim();
@@ -34,7 +35,7 @@ export const ErrorWrapper = ({
 
   return (
     <Block name="error-message">
-      {possum !== false && (
+      {!minimal && possum !== false && (
         <Elem
           tag="img"
           name="heidi"
@@ -44,9 +45,9 @@ export const ErrorWrapper = ({
         />
       )}
 
-      {title && <Elem name="title">{title}</Elem>}
+      {!minimal && title && <Elem name="title">{title}</Elem>}
 
-      {message && (
+      {!minimal && message && (
         <Elem
           name="detail"
           dangerouslySetInnerHTML={{
@@ -55,7 +56,7 @@ export const ErrorWrapper = ({
         />
       )}
 
-      {preparedStackTrace && (
+      {!minimal && preparedStackTrace && (
         <Elem
           name="stracktrace"
           dangerouslySetInnerHTML={{
@@ -76,7 +77,7 @@ export const ErrorWrapper = ({
         </Elem>
       )}
 
-      {(version || errorId) && (
+      {!minimal && (version || errorId) && (
         <Elem name="version">
           <Space>
             {version && `Version: ${version}`}
@@ -85,36 +86,38 @@ export const ErrorWrapper = ({
         </Elem>
       )}
 
-      <Elem name="actions">
-        <Space spread>
-          <Elem tag={Button} name="action-slack" target="_blank" icon={<IconSlack />} href={SLACK_INVITE_URL}>
-            Ask on Slack
-          </Elem>
+      {!minimal && (
+        <Elem name="actions">
+          <Space spread>
+            <Elem tag={Button} name="action-slack" target="_blank" icon={<IconSlack />} href={SLACK_INVITE_URL}>
+              Ask on Slack
+            </Elem>
 
-          <Space size="small">
-            {preparedStackTrace && (
-              <Button
-                disabled={copied}
-                onClick={copyStacktrace}
-                className="w-[100px]"
-                aria-label="Copy error stacktrace"
-              >
-                {copied ? "Copied" : "Copy Stacktrace"}
-              </Button>
-            )}
-            {onGoBack && (
-              <Button onClick={onGoBack} aria-label="Go back">
-                Go Back
-              </Button>
-            )}
-            {onReload && (
-              <Button onClick={onReload} aria-label="Reload page">
-                Reload
-              </Button>
-            )}
+            <Space size="small">
+              {preparedStackTrace && (
+                <Button
+                  disabled={copied}
+                  onClick={copyStacktrace}
+                  className="w-[100px]"
+                  aria-label="Copy error stacktrace"
+                >
+                  {copied ? "Copied" : "Copy Stacktrace"}
+                </Button>
+              )}
+              {onGoBack && (
+                <Button onClick={onGoBack} aria-label="Go back">
+                  Go Back
+                </Button>
+              )}
+              {onReload && (
+                <Button onClick={onReload} aria-label="Reload page">
+                  Reload
+                </Button>
+              )}
+            </Space>
           </Space>
-        </Space>
-      </Elem>
+        </Elem>
+      )}
     </Block>
   );
 };

web/apps/labelstudio/src/components/Error/InlineError.jsx

@@ -3,7 +3,7 @@ import { ApiContext } from "../../providers/ApiProvider";
 import { Block } from "../../utils/bem";
 import { ErrorWrapper } from "./Error";
 
-export const InlineError = ({ children, includeValidation, className, style }) => {
+export const InlineError = ({ minimal, children, includeValidation, className, style }) => {
   const context = React.useContext(ApiContext);
 
   React.useEffect(() => {
@@ -12,7 +12,11 @@ export const InlineError = ({ children, includeValidation, className, style }) =
 
   return context.error ? (
     <Block name="inline-error" mix={className} style={style}>
-      <ErrorWrapper possum={false} {...context.errorFormatter(context.error, { includeValidation })} />
+      <ErrorWrapper
+        possum={false}
+        minimal={minimal}
+        {...context.errorFormatter(context.error, { includeValidation })}
+      />
       {children}
     </Block>
   ) : null;

web/apps/labelstudio/src/pages/Settings/StorageSettings/StorageSet.jsx

@@ -18,7 +18,7 @@ export const StorageSet = ({ title, target, rootClass, buttonLabel }) => {
   const project = useAtomValue(projectAtom);
   const storageTypesQueryKey = ["storage-types", target];
   const storagesQueryKey = ["storages", target, project?.id];
-  const useNewStorageScreen = ff.isActive(ff.FF_NEW_STORAGES) && target !== "export";
+  const useNewStorageScreen = ff.isActive(ff.FF_NEW_STORAGES);
 
   const {
     storageTypes,

web/apps/labelstudio/src/pages/Settings/StorageSettings/providers/azure.ts

@@ -16,14 +16,22 @@ export const azureProvider: ProviderConfig = {
       placeholder: "my-azure-container",
       schema: z.string().min(1, "Container name is required"),
     },
+    {
+      name: "prefix",
+      type: "text",
+      label: "Bucket prefix",
+      placeholder: "path/to/files",
+      schema: z.string().optional().default(""),
+      target: "export",
+    },
     {
       name: "account_name",
       type: "password",
       label: "Account Name",
       autoComplete: "off",
       accessKey: true,
       placeholder: "mystorageaccount",
-      schema: z.string().min(1, "Account Name is required"),
+      schema: z.string().optional().default(""),
     },
     {
       name: "account_key",
@@ -32,7 +40,7 @@ export const azureProvider: ProviderConfig = {
       autoComplete: "new-password",
       accessKey: true,
       placeholder: "Your storage account key",
-      schema: z.string().min(1, "Account Key is required"),
+      schema: z.string().optional().default(""),
     },
     {
       name: "presign",
@@ -41,6 +49,8 @@ export const azureProvider: ProviderConfig = {
       description:
         "When pre-signed URLs are enabled, all data bypasses the platform and user browsers directly read data from storage",
       schema: z.boolean().default(true),
+      target: "import",
+      resetConnection: false,
     },
     {
       name: "presign_ttl",
@@ -50,19 +60,16 @@ export const azureProvider: ProviderConfig = {
       max: 10080,
       step: 1,
       schema: z.number().min(1).max(10080).default(15),
-      // dependency: "presign" // Not implemented in UI yet
+      target: "import",
+      resetConnection: false,
     },
   ],
   layout: [
-    {
-      fields: ["container"],
-    },
-    {
-      fields: ["account_name", "account_key"],
-    },
-    {
-      fields: ["presign", "presign_ttl"],
-    },
+    { fields: ["container"] },
+    { fields: ["prefix"] },
+    { fields: ["account_name"] },
+    { fields: ["account_key"] },
+    { fields: ["presign", "presign_ttl"] },
   ],
 };
 

web/apps/labelstudio/src/pages/Settings/StorageSettings/providers/gcs.ts

@@ -15,6 +15,14 @@ export const gcsProvider: ProviderConfig = {
       required: true,
       schema: z.string().min(1, "Bucket name is required"),
     },
+    {
+      name: "prefix",
+      type: "text",
+      label: "Bucket prefix",
+      placeholder: "path/to/files",
+      schema: z.string().optional().default(""),
+      target: "export",
+    },
     {
       name: "google_application_credentials",
       type: "password",
@@ -38,6 +46,8 @@ export const gcsProvider: ProviderConfig = {
       description:
         "When pre-signed URLs are enabled, all data bypasses the platform and user browsers directly read data from storage",
       schema: z.boolean().default(true),
+      target: "import",
+      resetConnection: false,
     },
     {
       name: "presign_ttl",
@@ -47,22 +57,17 @@ export const gcsProvider: ProviderConfig = {
       max: 10080,
       step: 1,
       schema: z.number().min(1).max(10080).default(15),
+      target: "import",
+      resetConnection: false,
       // dependency: "presign" // Not implemented in UI yet
     },
   ],
   layout: [
-    {
-      fields: ["bucket"],
-    },
-    {
-      fields: ["google_application_credentials"],
-    },
-    {
-      fields: ["google_project_id"],
-    },
-    {
-      fields: ["presign", "presign_ttl"],
-    },
+    { fields: ["bucket"] },
+    { fields: ["prefix"] },
+    { fields: ["google_application_credentials"] },
+    { fields: ["google_project_id"] },
+    { fields: ["presign", "presign_ttl"] },
   ],
 };
 

web/apps/labelstudio/src/pages/Settings/StorageSettings/providers/localFiles.ts

@@ -16,12 +16,16 @@ export const localFilesProvider: ProviderConfig = {
       placeholder: "/data/my-folder/",
       schema: z.string().min(1, "Path is required"),
     },
-  ],
-  layout: [
     {
-      fields: ["path"],
+      name: "prefix",
+      type: "text",
+      label: "Path",
+      placeholder: "path/to/files",
+      schema: z.string().optional().default(""),
+      target: "export",
     },
   ],
+  layout: [{ fields: ["path"] }, { fields: ["prefix"] }],
 };
 
 export default localFilesProvider;

web/apps/labelstudio/src/pages/Settings/StorageSettings/providers/redis.ts

@@ -27,8 +27,9 @@ export const redisProvider: ProviderConfig = {
       name: "host",
       type: "text",
       label: "Host",
+      required: true,
       placeholder: "redis://example.com",
-      schema: z.string(),
+      schema: z.string().min(1, "Host is required"),
     },
     {
       name: "port",
@@ -37,12 +38,16 @@ export const redisProvider: ProviderConfig = {
       placeholder: "6379",
       schema: z.string().default("6379"),
     },
-  ],
-  layout: [
     {
-      fields: ["host", "port", "db", "password"],
+      name: "prefix",
+      type: "text",
+      label: "Bucket prefix",
+      placeholder: "path/to/files",
+      schema: z.string().optional().default(""),
+      target: "export",
     },
   ],
+  layout: [{ fields: ["host", "port", "db", "password"] }, { fields: ["prefix"] }],
 };
 
 export default redisProvider;

web/apps/labelstudio/src/pages/Settings/StorageSettings/providers/s3.ts

@@ -20,16 +20,24 @@ export const s3Provider: ProviderConfig = {
       name: "region_name",
       type: "text",
       label: "Region Name",
-      placeholder: "us-east-1",
+      placeholder: "us-east-1 (default)",
       schema: z.string().optional().default(""),
     },
     {
       name: "s3_endpoint",
       type: "text",
       label: "S3 Endpoint",
-      placeholder: "https://s3.amazonaws.com",
+      placeholder: "https://s3.amazonaws.com (default)",
       schema: z.string().optional().default(""),
     },
+    {
+      name: "prefix",
+      type: "text",
+      label: "Bucket prefix",
+      placeholder: "path/to/files",
+      schema: z.string().optional().default(""),
+      target: "export",
+    },
     {
       name: "aws_access_key_id",
       type: "password",
@@ -65,6 +73,8 @@ export const s3Provider: ProviderConfig = {
       description:
         "When pre-signed URLs are enabled, all data bypasses the platform and user browsers directly read data from storage",
       schema: z.boolean().default(true),
+      target: "import",
+      resetConnection: false,
     },
     {
       name: "presign_ttl",
@@ -74,20 +84,18 @@ export const s3Provider: ProviderConfig = {
       max: 10080,
       step: 1,
       schema: z.number().min(1).max(10080).default(15),
+      target: "import",
+      resetConnection: false,
     },
   ],
   layout: [
-    {
-      fields: ["bucket"],
-    },
-    {
-      fields: ["region_name", "s3_endpoint"],
-    },
-    {
-      fields: ["aws_access_key_id", "aws_secret_access_key", "aws_session_token"],
-    },
-    {
-      fields: ["presign", "presign_ttl"],
-    },
+    { fields: ["bucket"] },
+    { fields: ["region_name"] },
+    { fields: ["s3_endpoint"] },
+    { fields: ["prefix"] },
+    { fields: ["aws_access_key_id"] },
+    { fields: ["aws_secret_access_key"] },
+    { fields: ["aws_session_token"] },
+    { fields: ["presign", "presign_ttl"] },
   ],
 };