Dev

api/src/models/FieldMapper.ts

@@ -1,6 +1,14 @@
 import { JSONFile } from "lowdb/node";
 import LowWithLodash from "../utils/lowdb-lodash.utils.js";
 
+interface Advanced {
+  validationRegex: string,
+  Mandatory:boolean,
+  Multiple:boolean,
+  Unique:boolean,
+  NonLocalizable:boolean
+}
+
 interface FieldMapper {
   field_mapper: {
     id: string;
@@ -13,6 +21,7 @@ interface FieldMapper {
     isDeleted: boolean;
     backupFieldType: string;
     refrenceTo: { uid: string; title: string };
+    advanced:Advanced
   }[];
 }
 

api/src/services/org.service.ts

@@ -48,15 +48,10 @@ const getAllStacks = async (req: Request): Promise<LoginServiceType> => {
         status: err.response.status,
       };
     }
-
+    let locale = await getStackLocal(token_payload, res.data.stacks);
     return {
       data: {
-        stacks:
-          res.data.stacks?.map((stack: any) => ({
-            name: stack.name,
-            api_key: stack.api_key,
-            master_locale: stack.master_locale,
-          })) || [],
+        stacks: locale,
       },
       status: res.status,
     };
@@ -280,6 +275,62 @@ const getStackStatus = async (req: Request) => {
     );
   }
 };
+//get all locals of particular stack
+const getStackLocal = async (token_payload: any, data: any) => {
+  const srcFun = "getStackLocal";
+  return new Promise(async (resolve, reject) => {
+    const authtoken = await getAuthtoken(
+      token_payload?.region,
+      token_payload?.user_id
+    );
+    let stacks = [];
+    for (let stack of data) {
+      const [err, res] = await safePromise(
+        https({
+          method: "GET",
+          url: `${config.CS_API[
+            token_payload?.region as keyof typeof config.CS_API
+          ]!}/locales`,
+          headers: {
+            api_key: stack.api_key,
+            authtoken,
+          },
+        })
+      );
+      if (err) {
+        logger.error(
+          getLogMessage(
+            srcFun,
+            HTTP_TEXTS.CS_ERROR,
+            token_payload,
+            err.response.data
+          )
+        );
+
+        return {
+          data: err.response.data,
+          status: err.response.status,
+        };
+      }
+      let localesArr:any =[]
+      res?.data?.locales.map((lang:any)=>{
+        return localesArr.push({
+          code:lang.code,
+          name:lang.name
+        })
+      })
+
+      let obj = {
+        name: stack.name,
+        api_key: stack.api_key,
+        master_locale: stack.master_locale,
+        locales: localesArr
+      };
+      stacks.push(obj);
+    }
+    resolve(stacks);
+  });
+};
 
 export const orgService = {
   getAllStacks,

api/src/validators/auth.validator.ts

@@ -50,6 +50,6 @@ export default checkSchema({
       errorMessage: VALIDATION_ERRORS.STRING_REQUIRED.replace("$", "2FA Token"),
       bail: true,
     },
-    trim: true,
+    trim: false,
   },
 });

ui/src/cmsData/login.json

@@ -3,7 +3,7 @@
   "locale": "en-us",
   "uid": "blt058427c4131df78a",
   "_in_progress": false,
-  "copyrightText": "© 2023-2024 Contentstack Inc. All rights reserved.",
+  "copyrightText": "Contentstack Inc. All rights reserved.",
   "created_at": "2024-02-22T11:20:53.435Z",
   "created_by": "bltb317ebe35429ebe6",
   "heading": "Stacks Not Suites",

ui/src/components/AccountPage/index.tsx

@@ -10,6 +10,9 @@ import './index.scss';
 const AccountPage = (props: AccountObj): JSX.Element => {
   const { heading, subtitle, copyrightText } = props.data;
 
+  const currentYear = new Date().getFullYear();
+  const previousYear = currentYear - 1;
+
   return (
     // eslint-disable-next-line react/no-unknown-property
     <div className="AccountPage" heap-ignore="true">
@@ -32,8 +35,8 @@ const AccountPage = (props: AccountObj): JSX.Element => {
         <span className="AccountPage__circle AccountPage__circle_seven"></span>
       </div>
       <div className="AccountPage__action">
-        <div className="AccountPage__content">{props.children}</div>
-        <p className='copyright_text'>{copyrightText}</p>
+        <div className="AccountPage__content">{props?.children}</div>
+        <p className='copyright_text'>{`© ${previousYear}-${currentYear} ${copyrightText}`}</p>
       </div>
     </div>
   );

ui/src/components/AdvancePropertise/index.tsx

@@ -1,32 +1,72 @@
+import { useState } from 'react';
+
 import {
   ModalBody,
   ModalHeader,
   FieldLabel,
   TextInput,
-  ToggleSwitch
+  ToggleSwitch,
+  Tooltip
 } from '@contentstack/venus-components';
 
 import './index.scss';
 
+
 export interface SchemaProps {
   fieldtype: string;
   value: any;
   rowId: string;
+  updateFieldSettings:(rowId:string, value:any, checkBoxChanged:boolean)=> void;
+  isLocalised:boolean;
   closeModal: () => void;
+  data:any
 }
-const AdvancePropertise = (props: SchemaProps) => {
+const AdvancePropertise = (props: SchemaProps) => { 
+
+
+  const [toggleStates, setToggleStates] = useState({
+    validationRegex: props?.value?.ValidationRegex,
+    mandatory: props?.value?.Mandatory,
+    multiple: props?.value?.Multiple,
+    unique: props?.value?.Unique,
+    nonLocalizable: props?.value?.NonLocalizable
+  });
+
+  const handleToggleChange = (field: string, value: boolean, checkBoxChanged: boolean) => {
+
+    setToggleStates(prevStates => ({
+      ...prevStates,
+      [field]: value
+  }));
+
+    props?.updateFieldSettings(props?.rowId, {[field?.charAt(0)?.toUpperCase() + field?.slice(1)]: value}, checkBoxChanged);
+};
+
+ const handleOnChange = ( field: string, event: any, checkBoxChanged: boolean) => {
+    setToggleStates(prevStates => ({
+      ...prevStates,
+      [field]: event?.target?.value
+  }));
+
+  props?.updateFieldSettings(props?.rowId, {[field?.charAt(0)?.toUpperCase() + field?.slice(1)]: event?.target?.value}, checkBoxChanged);
+
+ }
+
+
   return (
     <>
-      <ModalHeader title={`${props.fieldtype} propertise`} closeModal={props.closeModal} />
+      <ModalHeader title={`${props?.fieldtype} propertise`} closeModal={props?.closeModal} />
       <ModalBody>
         <FieldLabel htmlFor="someInput" version="v2">
           Validation (Regex)
         </FieldLabel>
         <TextInput
           className="validation-input"
           type="text"
+          value={toggleStates?.validationRegex}
           placeholder="Enter value"
           version="v2"
+          onChange={(e:any)=> handleOnChange("validationRegex",e, true)}
         />
         <FieldLabel className="option-label" htmlFor="someInput" version="v2">
           Options
@@ -36,26 +76,35 @@ const AdvancePropertise = (props: SchemaProps) => {
             label="Mandatory"
             labelColor="primary"
             labelPosition="right"
-            checked={props?.value?.mandatory}
+            checked={toggleStates?.mandatory}
+            onChange={(e:any) => handleToggleChange("mandatory" , e?.target?.checked, true)}
           />
           <ToggleSwitch
             label="Multiple"
             labelColor="primary"
             labelPosition="right"
-            checked={props?.value?.multiple}
+            checked={toggleStates?.multiple}
+            onChange={(e:any) => handleToggleChange("multiple" ,e?.target?.checked, true)}
           />
           <ToggleSwitch
             label="Unique"
             labelColor="primary"
             labelPosition="right"
-            checked={props?.value?.unique}
+            checked={toggleStates?.unique}
+            onChange={(e:any) => handleToggleChange("unique" , e?.target?.checked,true)}
           />
+          <Tooltip content='Available only if there are multiple languages in your stack' position='top' disabled={props?.isLocalised}>
           <ToggleSwitch
+            id="disabled"
+            disabled={ ! props?.isLocalised}
             label="Non-localizable"
             labelColor="primary"
             labelPosition="right"
-            checked={props?.value?.non_localizable}
+            checked={toggleStates?.nonLocalizable}
+            onChange={(e:any) => handleToggleChange("nonLocalizable" , e?.target?.checked,true)}
           />
+
+          </Tooltip>
           <p className="non-localizable-message">
             If enabled, editing this field is restricted in localized entries. The field will use
             the value of the master-language entry in all localized entries.

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

@@ -28,6 +28,9 @@ import { AddStackCMSData, defaultAddStackCMSData } from './addStack.interface';
 
 // Styles
 import './addStack.scss';
+import { getAllLocales } from '../../../services/api/user.service';
+import { validateObject } from '../../../utilities/functions';
+import { IDropDown } from '../../../context/app/app.interface';
 export interface Stack {
   name: string;
   description: string;
@@ -37,11 +40,11 @@ export interface Stack {
 const AddStack = (props: any): JSX.Element => {
   const [isProcessing, setIsProcessing] = useState(false);
   const [isLoading, setIsLoading] = useState(true);
+  const [allLocales, setAllLocales] = useState<IDropDown[]>([]);
   const [addStackCMSData, setAddStackCMSData] = useState<AddStackCMSData>(defaultAddStackCMSData);
-
   const onSubmit = async (formData: any) => {
     setIsProcessing(true);
-    const resp = await props.onSubmit({
+    const resp = await props?.onSubmit({
       name: formData?.name || props?.defaultValues?.name,
       description: formData?.description || props?.defaultValues?.description,
       locale: formData?.locale?.value || props?.defaultValues?.locale
@@ -52,7 +55,7 @@ const AddStack = (props: any): JSX.Element => {
         notificationContent: { text: 'Stack created successfully' },
         type: 'success'
       });
-      props.closeModal();
+      props?.closeModal();
     } else {
       Notification({ notificationContent: { text: 'Failed to create the stack' }, type: 'error' });
     }
@@ -77,6 +80,25 @@ const AddStack = (props: any): JSX.Element => {
         console.error(err);
         setIsLoading(false);
       });
+
+      //fetch all locales
+      getAllLocales(props?.selectedOrganisation).then((response:any) => {
+      const rawMappedLocalesMapped = validateObject(response?.data) && response?.data?.locales
+        ? Object?.keys(response?.data?.locales)?.map((key) => ({
+            uid: key,
+            label: response?.data?.locales[key],
+            value: key,
+            master_locale: key,
+            locales:[],
+            created_at: key
+          }))
+        : [];
+        setAllLocales(rawMappedLocalesMapped);
+      })
+      .catch((err: any) => {
+        console.error(err);
+      });
+      //org id will always be there
   }, []);
   return (
     <>
@@ -202,7 +224,7 @@ const AddStack = (props: any): JSX.Element => {
                                   }}
                                   name="locale"
                                   width="300px"
-                                  options={props?.locales}
+                                  options={allLocales}
                                   maxMenuHeight={200}
                                   isClearable={true}
                                   version={'v2'}

ui/src/components/ContentMapper/contentMapper.interface.ts

@@ -9,6 +9,13 @@ interface mapDataType {
   contentTypes: ContentType[];
   projectId: string;
 }
+interface Advanced {
+  ValidationRegex: string,
+  mandatory:boolean,
+  multiple:boolean,
+  unique:boolean,
+  nonLocalizable:boolean
+}
 export interface ContentMapperType {
   content_types_heading?: string;
   cta: CTA;
@@ -24,7 +31,7 @@ export interface ContentstackFields {
 
 export interface FieldTypes {
   label: string;
-  value: string;
+  value: any;
 }
 export interface TableTypes {
   sortBy: any;
@@ -47,6 +54,7 @@ export interface ContentType {
 
 export interface FieldMapType {
   ContentstackFieldType: string;
+  child?: FieldMapType[] | undefined;
   backupFieldType: string;
   contentstackField: string;
   contentstackFieldUid: string;
@@ -55,7 +63,8 @@ export interface FieldMapType {
   otherCmsType: string;
   uid: string;
   id: string;
-  _invalid?: boolean;
+  _canSelect?: boolean;
+  advanced:Advanced
 }
 
 export interface ItemStatus {
@@ -99,3 +108,11 @@ export interface optionsType {
 export interface ExstingContentTypeMatch {
   [key: string]: string;
 }
+
+export interface UidMap {
+  [key: string]: boolean;
+}
+
+export interface ContentTypeMap {
+  [key: string]: string;
+}