Merge pull request #824 from contentstack/feature/aem-final

Feature/aem final

Author: sayalijoshi27

.gitignore

@@ -360,6 +360,9 @@ upload-api/extracted_files*
 *copy*
 .qodo
 .vscode
+app.json
+# Snyk Security Extension - AI Rules (auto-generated)
+.cursor/rules/snyk_rules.mdc
 *extracted_files*
 *MigrationData*
 *.zip

ui/src/components/AdvancePropertise/index.tsx

@@ -331,8 +331,6 @@ const AdvancePropertise = (props: SchemaProps) => {
     });
   };
 
-
-
   const handleDrop = (index: number) => {
     if (draggedIndex === null) return;
 
@@ -588,7 +586,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                     props?.data?.contentstackFieldUid
                   );
                 }}
-                options={option}
+                options={option ?? []}
                 placeholder="Add Content Type(s)"
                 version="v2"
                 isSearchable={true}
@@ -673,6 +671,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                           true
                         ))
                     }
+                    disabled={props?.fieldtype === 'Modular Blocks' || props?.fieldtype === 'Block'}
                   />
                 </div>
               )}

ui/src/components/Common/AddStack/addStack.tsx

@@ -24,7 +24,7 @@ import { getCMSDataFromFile } from '../../../cmsData/cmsSelector';
 import { CS_ENTRIES } from '../../../utilities/constants';
 
 // Interface
-import { AddStackCMSData, defaultAddStackCMSData } from './addStack.interface';
+import { AddStackCMSData, defaultAddStackCMSData, Errors, Stack } from './addStack.interface';
 
 // Styles
 import './addStack.scss';
@@ -129,8 +129,12 @@ const AddStack = (props: any): JSX.Element => {
         <FinalForm
           onSubmit={onSubmit}
           keepDirtyOnReinitialize={true}
-          validate={(values: any) => {
-            const errors: any = {};
+          validate={(values: Stack) => {
+            const errors: Errors = {
+              name: '',
+              locale: '',
+              description: ''
+            };
             if (!values?.name || values?.name?.trim().length < 1) {
               errors.name = 'Stack name required';
             }
@@ -263,7 +267,7 @@ const AddStack = (props: any): JSX.Element => {
                                 version={'v2'}
                                 placeholder={addStackCMSData?.stack_locale_description}
                               />
-                              <div className="stack-creation-warning"><span className='imp-text'>Important:</span> The master language cannot be changed after the stack has been created.</div>
+                              <div className="stack-creation-warning"><span className='imp-text'>Important:</span> The default language cannot be changed after the stack has been created.</div>
                               {meta?.error && meta?.touched && (
                                 <ValidationMessage
                                   testId="cs-stack-create-language-validation"

ui/src/components/ContentMapper/index.scss

@@ -320,7 +320,7 @@ div .table-row {
   display: block;
 }
 .advanced-setting-button {
-  padding: 5px;
+  padding: 5px 10px;
 }
 .field-count {
   font-size: $size-font-large;