windmill-components 1.542.5 → 1.555.0

package/package/workspace_settings.js

@@ -1,50 +1,65 @@
 import { emptyString } from './utils';
-export function convertBackendSettingsToFrontendSettings(large_file_storage) {
-    let settings = convertBackendSettingsToFrontendSettingsItem(large_file_storage);
-    settings.secondaryStorage = Object.entries(large_file_storage?.secondary_storage ?? {}).map(([key, value]) => [key, convertBackendSettingsToFrontendSettingsItem(value)]);
+export function convertBackendSettingsToFrontendSettings(large_file_storage, isEnterprise) {
+    let settings = convertBackendSettingsToFrontendSettingsItem(large_file_storage, isEnterprise);
+    settings.secondaryStorage = Object.entries(large_file_storage?.secondary_storage ?? {}).map(([key, value]) => [key, convertBackendSettingsToFrontendSettingsItem(value, isEnterprise)]);
     return settings;
 }
-export function convertBackendSettingsToFrontendSettingsItem(large_file_storage) {
+export function convertBackendSettingsToFrontendSettingsItem(large_file_storage, isEnterprise) {
+    let advancedPermissions = large_file_storage?.advanced_permissions
+        ? large_file_storage.advanced_permissions.map((rule) => ({
+            ...rule,
+            allow: rule.allow
+                ?.split(',')
+                .filter((rule) => !!rule)
+                .map((rule) => rule)
+        }))
+        : undefined;
     if (large_file_storage?.type === 'S3Storage') {
         return {
             resourceType: 's3',
             resourcePath: large_file_storage?.s3_resource_path?.replace('$res:', ''),
-            publicResource: large_file_storage?.public_resource
+            publicResource: large_file_storage?.public_resource,
+            advancedPermissions
         };
     }
     else if (large_file_storage?.type === 'AzureBlobStorage') {
         return {
             resourceType: 'azure_blob',
             resourcePath: large_file_storage?.azure_blob_resource_path?.replace('$res:', ''),
-            publicResource: large_file_storage?.public_resource
+            publicResource: large_file_storage?.public_resource,
+            advancedPermissions
         };
     }
     else if (large_file_storage?.type === 'AzureWorkloadIdentity') {
         return {
             resourceType: 'azure_workload_identity',
             resourcePath: large_file_storage?.azure_blob_resource_path?.replace('$res:', ''),
-            publicResource: large_file_storage?.public_resource
+            publicResource: large_file_storage?.public_resource,
+            advancedPermissions
         };
     }
     else if (large_file_storage?.type === 'S3AwsOidc') {
         return {
             resourceType: 's3_aws_oidc',
             resourcePath: large_file_storage?.s3_resource_path?.replace('$res:', ''),
-            publicResource: large_file_storage?.public_resource
+            publicResource: large_file_storage?.public_resource,
+            advancedPermissions
         };
     }
     else if (large_file_storage?.type === 'GoogleCloudStorage') {
         return {
             resourceType: 'gcloud_storage',
             resourcePath: large_file_storage?.gcs_resource_path?.replace('$res:', ''),
-            publicResource: large_file_storage?.public_resource
+            publicResource: large_file_storage?.public_resource,
+            advancedPermissions
         };
     }
     else {
         return {
             resourceType: 's3',
             resourcePath: undefined,
-            publicResource: undefined
+            publicResource: undefined,
+            advancedPermissions: defaultS3AdvancedPermissions(isEnterprise)
         };
     }
 }
@@ -61,7 +76,15 @@ export function convertFrontendToBackendettingsItem(s3ResourceSettings) {
     if (!emptyString(s3ResourceSettings.resourcePath)) {
         let resourcePathWithPrefix = `$res:${s3ResourceSettings.resourcePath}`;
         let params = {
-            public_resource: s3ResourceSettings.publicResource
+            public_resource: s3ResourceSettings.publicResource,
+            ...(s3ResourceSettings.advancedPermissions
+                ? {
+                    advanced_permissions: s3ResourceSettings.advancedPermissions.map((rule) => ({
+                        ...rule,
+                        allow: rule.allow.join(',')
+                    }))
+                }
+                : {})
         };
         if (s3ResourceSettings.resourceType === 'azure_blob') {
             let typ = 'AzureBlobStorage';
@@ -91,3 +114,15 @@ export function convertFrontendToBackendettingsItem(s3ResourceSettings) {
         return params;
     }
 }
+export function defaultS3AdvancedPermissions(isEnterprise) {
+    if (!isEnterprise)
+        return undefined;
+    return [
+        { pattern: 'windmill_uploads/*', allow: ['read', 'write', 'delete'] },
+        { pattern: 'u/{username}/**/*', allow: ['read', 'write', 'delete', 'list'] },
+        { pattern: 'g/{group}/**/*', allow: ['read', 'write', 'delete', 'list'] },
+        { pattern: 'f/{folder_write}/**/*', allow: ['read', 'write', 'delete', 'list'] },
+        { pattern: 'f/{folder_read}/**/*', allow: ['read', 'list'] },
+        { pattern: '**/*', allow: [] }
+    ];
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.542.5",
+	"version": "1.555.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
@@ -145,13 +145,13 @@
 		"windmill-parser-wasm-nu": "1.510.1",
 		"windmill-parser-wasm-php": "1.510.1",
 		"windmill-parser-wasm-py": "1.538.0",
-		"windmill-parser-wasm-regex": "1.512.0",
+		"windmill-parser-wasm-regex": "1.552.1",
 		"windmill-parser-wasm-ruby": "1.526.1",
 		"windmill-parser-wasm-rust": "1.510.1",
 		"windmill-parser-wasm-ts": "1.538.0",
 		"windmill-parser-wasm-yaml": "1.510.1",
 		"windmill-sql-datatype-parser-wasm": "1.512.0",
-		"windmill-utils-internal": "^1.3.0",
+		"windmill-utils-internal": "^1.3.1",
 		"xterm": "^5.3.0",
 		"xterm-readline": "^1.1.2",
 		"y-monaco": "^0.1.4",
@@ -542,4 +542,4 @@
 		"@rollup/rollup-linux-x64-gnu": "^4.35.0",
 		"fsevents": "^2.3.3"
 	}
-}
+}