form-craft-package 1.7.6-dev.0 → 1.7.7-dev.0

package/.env.development

@@ -1,4 +1,4 @@
-VITE_API_BASE_URL=https://formcraftmaster-backend-ecgtewb6cag8faeq.centralus-01.azurewebsites.net
+VITE_API_BASE_URL=https://formcraftmaster-backend-dev-f8egf2fcfhhahuhr.centralus-01.azurewebsites.net
 VITE_LOG_LEVEL=debug
 VITE_COOKIE_DOMAIN=localhost
 VITE_ENV=development

package/.env.staging

@@ -1,4 +1,4 @@
-VITE_API_BASE_URL=https://formcraftmaster-backend-ecgtewb6cag8faeq.centralus-01.azurewebsites.net
+VITE_API_BASE_URL=https://formcraftmaster-backend-dev-f8egf2fcfhhahuhr.centralus-01.azurewebsites.net
 VITE_LOG_LEVEL=debug
 VITE_COOKIE_DOMAIN=localhost
 VITE_ENV=staging

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "form-craft-package",
-  "version": "1.7.6-dev.0",
+  "version": "1.7.7-dev.0",
   "main": "index.ts",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/enums/form.enum.ts

@@ -59,6 +59,7 @@ export enum ButtonElementTypeEnum {
   Danger = 'Danger',
   DangerOutlined = 'DangerOutline',
   Link = 'Link',
+  Custom = 'Custom'
 }
 export enum ButtonElementSizeEnum {
   Default = 'default',

package/src/enums/index.ts

@@ -55,7 +55,8 @@ export enum AlignTypeEnum {
 export * from './companies'
 export enum LOCAL_STORAGE_KEYS_ENUM {
   DynamicForms = '38be231fe41c169037ed04c267ebe070',
-  Domain = '6a6cb9bc5739ce27347f6311472e0276'
+  Domain = '6a6cb9bc5739ce27347f6311472e0276',
+  Config = '0db535f06ff882031118cc63ae7d5395'
 }
 export enum CountryEnum {
   US = 'us',

package/src/functions/companies/use-company-config.tsx

@@ -17,12 +17,15 @@ export const useCompanyConfig = (): {
   const [loading, setLoading] = useState<boolean>(true)
   const [error, setError] = useState<string | null>(null)
 
-  // Get domain once, safely
   useEffect(() => {
     const storedDomain = localStorage.getItem(LOCAL_STORAGE_KEYS_ENUM.Domain)
     const params = new URLSearchParams(window.location.search)
     const paramDomain = params.get('domain')
-    const isLocalhost = ['localhost', '127.0.0.1'].includes(window.location.hostname)
+    const isLocalhost = [
+      'localhost',
+      '127.0.0.1',
+      'formcraft-frontend-dev-abegene0cmb5acfk.centralus-01.azurewebsites.net',
+    ].some((domain) => window.location.hostname.includes(domain))
 
     let resolvedDomain = storedDomain
 
@@ -30,6 +33,8 @@ export const useCompanyConfig = (): {
       resolvedDomain = paramDomain
     } else if (!storedDomain && paramDomain) {
       resolvedDomain = paramDomain
+    } else if (!isLocalhost && !storedDomain && !paramDomain) {
+      resolvedDomain = window.location.hostname
     }
 
     if (!resolvedDomain) {
@@ -49,14 +54,18 @@ export const useCompanyConfig = (): {
     try {
       const response = await client.get<ICompanyConfig>(`/api/company/${currentDomain}/configpublic`)
       if (response.status === 200 && Object.keys(response.data).length > 0) {
+        localStorage.setItem(LOCAL_STORAGE_KEYS_ENUM.Config, JSON.stringify(response.data))
         setConfig(response.data)
+        setThemeConfig(response.data.siteLayout?.siteConfigs || DEFAULT_CONFIG.siteLayout.siteConfigs)
         setError(null)
       } else {
         throw new Error('Empty or invalid config received')
       }
     } catch (err) {
-      console.error('Error fetching company config:', err)
-      setError('Failed to load company configuration')
+      console.error('Error fetching company config, using default:', err)
+      setConfig(DEFAULT_CONFIG)
+      setThemeConfig(DEFAULT_CONFIG.siteLayout.siteConfigs)
+      setError('Failed to load company configuration. Using default config.')
     } finally {
       setLoading(false)
     }

package/src/types/companies/site-layout/authenticated/index.tsx

@@ -77,7 +77,7 @@ export const layoutTemplates = [
           <div key={form.id} className="">
             <Link
               to={href}
-              target={form.customLink && '_blank'}
+              target={form.customLink || form.newTab ? '_blank' : '_self'}
               onClick={isParentMenu ? () => toggleMenu(form.id) : undefined}
               style={{
                 width: `${navigationWidth - 25}px`,
@@ -281,7 +281,7 @@ export const layoutTemplates = [
           <div key={form.id} className="relative group">
             <Link
               to={href}
-              target={form.customLink && '_blank'}
+              target={form.customLink || form.newTab ? '_blank' : '_self'}
               onClick={isParentMenu ? (e) => e.preventDefault() : undefined}
               style={{
                 borderRadius: `${siteConfigs?.Link.borderRadius}px`,
@@ -484,7 +484,7 @@ export const layoutTemplates = [
           <div key={form.id} className="menu-item">
             <Link
               to={href}
-              target={form.customLink && '_blank'}
+              target={form.customLink || form.newTab ? '_blank' : '_self'}
               onClick={isParentMenu ? () => toggleMenu(form.id) : undefined}
               style={{
                 width: `${navigationWidth - 25}px`,