Merge remote-tracking branch 'origin/develop' into develop

awslabs · Nov 11, 2024 · 2d796b4 · 2d796b4
2 parents 73bec5a + f5fab10
commit 2d796b4
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 22 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -373,7 +373,9 @@
                     "xxl",
                     "xxs",
                     "zod",
-                    "zoneout"
+                    "zoneout",
+                    "xlsx",
+                    "xlf"
                 ],
                 "skipIfMatch": [
                     "http://[^s]*",

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@amzn/mlspace",
   "homepage": "/Prod",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "main": "dist/lib/index.js",
   "types": "dist/types/index.d.ts",
   "private": true,

diff --git a/frontend/src/entities/batch-translate/create/batch-translate-create.tsx b/frontend/src/entities/batch-translate/create/batch-translate-create.tsx
@@ -69,6 +69,31 @@ export function BatchTranslateCreate () {
     const notificationService = useNotificationService(dispatch);
     const navigate = useNavigate();
     const auth = useAuth();
+    const plainTextOption: OptionDefinition = {
+        label: 'Plain text (.txt)',
+        value: 'text/plain',
+    };
+    const docTypeOptions: OptionDefinition[] = [
+        plainTextOption,
+        { label: 'HTML (.html)', value: 'text/html' },
+        {
+            label: 'Word document (.docx)',
+            value: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+        },
+        {
+            label: 'Excel workbook (.xlsx)',
+            value: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+        },
+        {
+            label: 'PowerPoint presentation (.pptx)',
+            value: 'application/vnd.openxmlformats-officedocument.presentationml.presentation'
+        },
+        {
+            label: 'XLIFF 1.2 (.xlf)',
+            value: 'application/x-xliff+xml'
+        }
+    ];
+    const [docType, setDocType] = useState<OptionDefinition>(plainTextOption);
     const userName = auth.user!.profile.preferred_username;
     const nameConstraintText =
         'Maximum of 255 alphanumeric characters. Can include hyphens (-), but not spaces. Must be unique within your account in an AWS Region.';
@@ -332,22 +357,39 @@ export function BatchTranslateCreate () {
                         </SpaceBetween>
                     </Container>
                     <Container header={<Header variant='h2'>Input data</Header>}>
-                        <DatasetResourceSelector
-                            fieldLabel={'S3 Location'}
-                            selectableItemsTypes={['prefixes']}
-                            onChange={({detail}) => {
-                                setFields({
-                                    'InputDataConfig.S3Uri': detail.resource,
-                                });
-                            }}
-                            inputOnBlur={() => {
-                                touchFields(['InputDataConfig.S3Uri']);
-                            }}
-                            inputInvalid={!!formErrors?.InputDataConfig?.S3Uri}
-                            inputData-cy='s3-output-location-input'
-                            fieldErrorText={formErrors?.InputDataConfig?.S3Uri}
-                            resource={state.form?.InputDataConfig?.S3Uri || ''}
-                        />
+                        <SpaceBetween direction='vertical' size='m'>
+                            <DatasetResourceSelector
+                                fieldLabel={'S3 Location'}
+                                selectableItemsTypes={['prefixes']}
+                                onChange={({detail}) => {
+                                    setFields({
+                                        'InputDataConfig.S3Uri': detail.resource,
+                                    });
+                                }}
+                                inputOnBlur={() => {
+                                    touchFields(['InputDataConfig.S3Uri']);
+                                }}
+                                inputInvalid={!!formErrors?.InputDataConfig?.S3Uri}
+                                inputData-cy='s3-output-location-input'
+                                fieldErrorText={formErrors?.InputDataConfig?.S3Uri}
+                                resource={state.form?.InputDataConfig?.S3Uri || ''}
+                            />
+                            <FormField
+                                description='The document type of the document(s) for batch translation.'
+                                label='Document Type'
+                            >
+                                <Select
+                                    selectedOption={docType}
+                                    onChange={({ detail }) => {
+                                        setDocType(detail.selectedOption);
+                                        setFields({
+                                            'InputDataConfig.ContentType': detail.selectedOption.value,
+                                        });
+                                    }}
+                                    options={docTypeOptions}
+                                />
+                            </FormField>
+                        </SpaceBetween>
                     </Container>
                     <Container header={<Header variant='h2'>Output data</Header>}>
                         <DatasetResourceSelector

diff --git a/frontend/src/release-notes.md b/frontend/src/release-notes.md
@@ -1,10 +1,12 @@
-# Release 1.6.4
+# Release 1.6.5
 
-## Bug Fixes
-- Resolved one last outstanding issue related to unsafe calling of an unsupported IAM feature in certain regions
+## Enhancements
+- Integrated Amazon Bedrock permissions into IAM policies for Notebooks
+- Configured default encryption to use Amazon S3-managed keys when an AWS KMS key is not specified
+- Expanded document type support for batch processing in Amazon Translate jobs
 
 ## Acknowledgements
 * @dustins
 * @estohlmann
 
-**Full Changelog**: https://github.com/awslabs/mlspace/compare/v1.6.3...v1.6.4
+**Full Changelog**: https://github.com/awslabs/mlspace/compare/v1.6.4...v1.6.5