Merge pull request #124 from edsonmartins/develop

fix: tratar quando não encontrar uma linguagem definida

Author: edsonmartins

package.json

@@ -37,7 +37,7 @@
     "docs": "npx typedoc --options typedoc.json",
     "commit": "git-cz"
   },
-  "lint-staged":  {
+  "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
       "eslint --fix",
       "prettier --write"
@@ -123,6 +123,7 @@
     "react-date-object": "^2.1.8",
     "react-demo-page": "^0.3.6",
     "react-dom": "^18.3.1",
+    "react-easy-crop": "^5.4.1",
     "react-final-form": "^6.5.9",
     "react-final-form-arrays": "^3.1.4",
     "react-frame-component": "^5.2.7",

pnpm-lock.yaml

@@ -22,6 +22,7 @@ interface ResultItem {
 	title: string | undefined;
 	link: string;
 	redirect?: string;
+	customTitle?: string;
 }
 
 export function ArchbaseAdminTabContainer({
@@ -93,6 +94,7 @@ export function ArchbaseAdminTabContainer({
 			title: undefined,
 			link,
 			redirect: undefined,
+			customTitle: undefined,
 		};
 		navigationData.forEach((item) => {
 			if (item.links) {
@@ -102,6 +104,7 @@ export function ArchbaseAdminTabContainer({
 						result.item = subItem;
 						result.title = `${i18next.t(subItem.label)}`;
 						result.redirect = subItem.redirect;
+						result.customTitle = subItem.customTitle;
 					}
 				});
 			} else if (item.link && !result.item) {
@@ -112,11 +115,15 @@ export function ArchbaseAdminTabContainer({
 					} else {
 						result.title = `${i18next.t(item.label)}`;
 					}
-					result.redirect = item.redirect;
 					result.item = item;
+					result.redirect = item.redirect;
+					result.customTitle = item.customTitle;
 				}
 			}
 		});
+		if (result.customTitle) {
+			result.customTitle = result.customTitle.replace("$title", result.title)
+		}
 
 		return result;
 	};
@@ -145,6 +152,7 @@ export function ArchbaseAdminTabContainer({
 						iconClass: resultItem.item!.icon,
 						closeButton: true,
 						redirect: resultItem.redirect,
+						customTitle: resultItem.customTitle,
 					});
 					onChangeOpenedTabs && onChangeOpenedTabs(openedTabs);
 					setActiveTabId(`${resultItem.link}`);
@@ -178,6 +186,7 @@ export function ArchbaseAdminTabContainer({
 				key: tab.id,
 				favicon: tab.iconClass,
 				title: tab.title,
+				customTitle: tab.customTitle
 			};
 
 			return result;

src/components/admin/ArchbaseAdminTabContainer.tsx

@@ -81,7 +81,7 @@ export const ArchbaseChangeLanguageAction = () => {
 
 	const buildMenuItemLanguages = () => {
 		if (context.languages) {
-			return context.languages.map((language) => {
+			return context.languages.filter(language => language).map((language) => {
 				return (
 					<Menu.Item
 						key={language.name}

src/components/admin/ArchbaseChangeLanguageAction.tsx

@@ -24,7 +24,7 @@ export const ArchbaseChangeLanguageMenuItem = () => {
 
 	const buildMenuItemLanguages = () => {
 		if (context.languages) {
-			return context.languages.map((language) => {
+			return context.languages.filter(language => language).map((language) => {
 				return (
 					<Menu.Item
 						key={language.name}
@@ -54,7 +54,7 @@ export const ArchbaseChangeLanguageMenuItem = () => {
 					gap={4}
 					title={i18next.t('archbase:toggleLanguage')}>
 					{getIconByLanguage(i18n.language)}
-					{`${context.languages.find(language => language.lang === i18n.language).name}`}
+					{`${context.languages.find(language => language.lang === i18n.language)?.name ?? "Português"}`}
 				</Group>
 			</Menu.Target>