@geowiki/ui 0.15.1-dev.0 → 0.16.0-dev.0

package/dist/index.mjs

@@ -5,7 +5,7 @@ import {
   __require,
   __spreadProps,
   __spreadValues
-} from "./chunk-5PBHZKXW.mjs";
+} from "./chunk-J22S7K3T.mjs";
 
 // src/components/ui/alert-dialog.tsx
 import * as React2 from "react";
@@ -119,16 +119,19 @@ var getPages = (totalPages, currentPage) => {
     const hasRightSpill = totalPages - endPage > 1;
     const spillOffset = totalNumbers - (pages.length + 3);
     switch (true) {
+      // handle: (1) ... {6} [7] (8)
       case (hasLeftSpill && !hasRightSpill): {
         const extraPages = range(startPage - spillOffset, startPage - 1);
         pages = ["SPACER", ...extraPages, ...pages];
         break;
       }
+      // handle: (1) {2} [3] {4} ... (8)
       case (!hasLeftSpill && hasRightSpill): {
         const extraPages = range(endPage + 1, endPage + spillOffset);
         pages = [...pages, ...extraPages, "SPACER"];
         break;
       }
+      // handle: (1) ... {3} [4] {5} ... (8)
       case (hasLeftSpill && hasRightSpill):
       default: {
         pages = ["SPACER", ...pages, "SPACER"];
@@ -186,8 +189,7 @@ function parseTitle(title, type) {
   return parsedTitle.join("");
 }
 var isAdmin = (token) => {
-  if (!token)
-    return false;
+  if (!token) return false;
   try {
     const decodedToken = jwtDecode(token);
     return decodedToken.role.includes(USER_ROLE.ADMIN) || decodedToken.role.includes(USER_ROLE.FARMER_CLUSTER_ADMIN);
@@ -2248,8 +2250,7 @@ function toast(_a) {
       id,
       open: true,
       onOpenChange: (open) => {
-        if (!open)
-          dismiss();
+        if (!open) dismiss();
       }
     })
   });
@@ -2398,8 +2399,7 @@ var NextImage = ({
 import classNames from "classnames";
 import { jsx as jsx36 } from "react/jsx-runtime";
 var HtmlLinkList = ({ links }) => {
-  if (!links)
-    return null;
+  if (!links) return null;
   return /* @__PURE__ */ jsx36("div", { children: links == null ? void 0 : links.map((link) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     return /* @__PURE__ */ jsx36(
@@ -2421,7 +2421,7 @@ var HtmlLinkList = ({ links }) => {
 var HtmlLinkList_default = HtmlLinkList;
 
 // src/components/ui/footer.tsx
-import { signIn } from "next-auth/react";
+import { signIn } from "@geowiki/core";
 import { jsx as jsx37, jsxs as jsxs13 } from "react/jsx-runtime";
 var Footer = ({ settings, sessionStatus }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
@@ -2448,13 +2448,7 @@ var Footer = ({ settings, sessionStatus }) => {
         Button,
         {
           className: "mr-2 link",
-          onClick: () => {
-            var _a2, _b2;
-            return signIn("openiddict", {
-              callbackUrl: ((_b2 = (_a2 = settings == null ? void 0 : settings.generalSettings.GeoWikiSettings) == null ? void 0 : _a2.Host) == null ? void 0 : _b2.Text) + "/api/auth/callback/openiddict",
-              redirect: false
-            });
-          },
+          onClick: () => signIn(),
           children: "Facilitator Login"
         }
       ) : null : null
@@ -2570,12 +2564,10 @@ FormMessage.displayName = "FormMessage";
 import { useState as useState2 } from "react";
 import { Dialog as Dialog2 } from "@headlessui/react";
 import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
-import { signIn as signIn2, useSession } from "next-auth/react";
-import { useRouter } from "next/router";
+import { signIn as signIn2, signOut, useSession } from "@geowiki/core";
 import { jsx as jsx39, jsxs as jsxs14 } from "react/jsx-runtime";
 var TopNavbar = ({ branding, mainMenu }) => {
   var session = useSession();
-  var router = useRouter();
   const [mobileMenuOpen, setMobileMenuOpen] = useState2(false);
   return /* @__PURE__ */ jsxs14("header", { className: "bg-white", children: [
     /* @__PURE__ */ jsxs14(
@@ -2614,7 +2606,7 @@ var TopNavbar = ({ branding, mainMenu }) => {
               Button,
               {
                 className: "text-sm font-semibold leading-6",
-                onClick: () => signIn2("openiddict"),
+                onClick: () => signIn2(),
                 children: [
                   "Login ",
                   /* @__PURE__ */ jsx39("span", { "aria-hidden": "true", children: " \u2192" })
@@ -2625,7 +2617,7 @@ var TopNavbar = ({ branding, mainMenu }) => {
               Button,
               {
                 className: "text-sm font-semibold leading-6",
-                onClick: () => router == null ? void 0 : router.push("/logout"),
+                onClick: () => signOut(),
                 children: [
                   "Logout ",
                   /* @__PURE__ */ jsx39("span", { "aria-hidden": "true", children: " \u2192" })
@@ -3053,8 +3045,7 @@ function toast2(_a) {
       id,
       open: true,
       onOpenChange: (open) => {
-        if (!open)
-          dismiss();
+        if (!open) dismiss();
       }
     })
   });
@@ -3133,7 +3124,7 @@ var ProfileSettings = ({ data }) => {
   const { handleSubmit, register } = useForm();
   const { toast: toast4 } = useToast2();
   const queryClient = useQueryClient();
-  const onSubmit = (data2) => __async(void 0, null, function* () {
+  const onSubmit = (data2) => __async(null, null, function* () {
     try {
       yield ProfileService.profileUpdate(data2);
       toast4({
@@ -3216,7 +3207,7 @@ var ChangePassword = () => {
     newPassword: "",
     confirmNewPassword: ""
   });
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     if (shouldDisabled()) {
       toast4({
         title: "Password Incorrect",
@@ -3977,7 +3968,7 @@ var AccountEdit = ({ data, open, setOpen }) => {
   const handleInputChange = () => {
     setShowSaving(false);
   };
-  const onSubmit = (data2) => __async(void 0, null, function* () {
+  const onSubmit = (data2) => __async(null, null, function* () {
     try {
       yield ProfileService3.profileUpdate(data2);
       toast4({
@@ -4224,7 +4215,7 @@ var PasswordEdit = ({ open, setOpen }) => {
       setIsSaving(false);
     }
   }, [formValues, hasInteracted]);
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     try {
       setIsSaving(true);
       const requestBody = data;
@@ -4644,7 +4635,7 @@ var TestEmail = ({ onDismiss }) => {
   useEffect4(() => {
     setOpen(true);
   }, []);
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     try {
       const payload = data;
       yield EmailSettingsService.emailSettingsSendTestEmail(payload);
@@ -4733,7 +4724,7 @@ var Emailing = () => {
     },
     [emailSettingDto]
   );
-  const onSubmitEvent = () => __async(void 0, null, function* () {
+  const onSubmitEvent = () => __async(null, null, function* () {
     try {
       yield EmailSettingsService2.emailSettingsUpdate(__spreadValues({}, emailSettingDto));
       toast4({
@@ -5120,7 +5111,7 @@ var AddTenant = () => {
   const { toast: toast4 } = useToast2();
   const { handleSubmit, register } = useForm7();
   const queryClient = useQueryClient5();
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     const newTenant = data;
     try {
       yield TenantService.tenantCreate(newTenant);
@@ -5225,7 +5216,7 @@ var TenantEdit = ({
       setEnableHost(true);
     }
   }, [tenantDto, (_a = tenantDto == null ? void 0 : tenantDto.extraProperties) == null ? void 0 : _a.Host]);
-  const onSubmit = (dto) => __async(void 0, null, function* () {
+  const onSubmit = (dto) => __async(null, null, function* () {
     const tenant = dto;
     try {
       yield TenantService2.tenantUpdate(tenantId, tenant);
@@ -5372,7 +5363,7 @@ var FeatureList = ({ onDismiss, tenantId }) => {
       setEnableEmailSetting(value);
     }
   };
-  const onSubmit = () => __async(void 0, null, function* () {
+  const onSubmit = () => __async(null, null, function* () {
     try {
       const featureUpdateDto = {};
       featureUpdateDto.features = [
@@ -5406,7 +5397,7 @@ var FeatureList = ({ onDismiss, tenantId }) => {
       }
     }
   });
-  const onResetToDefaultEvent = () => __async(void 0, null, function* () {
+  const onResetToDefaultEvent = () => __async(null, null, function* () {
     try {
       yield FeaturesService.featuresDelete(PermissionProvider.T, tenantId);
       toast4({
@@ -5498,8 +5489,7 @@ import {
 import { Fragment as Fragment7, jsx as jsx65, jsxs as jsxs37 } from "react/jsx-runtime";
 var PermissionActions = ({ actions }) => {
   const renderElement = (action) => {
-    if (!action.showButton || action.visible)
-      return false;
+    if (!action.showButton || action.visible) return false;
     return /* @__PURE__ */ jsx65(DropdownMenuItem2, { children: /* @__PURE__ */ jsxs37(Button, { variant: "secondary", onClick: action.callback, size: "sm", children: [
       action.icon === "permission" && /* @__PURE__ */ jsxs37("div", { className: "flex items-center space-x-1", children: [
         /* @__PURE__ */ jsx65(
@@ -5609,8 +5599,7 @@ var Pagination = ({
         variant: "default",
         disabled: !table.getCanPreviousPage(),
         onClick: () => {
-          if (!table.getCanPreviousPage())
-            return;
+          if (!table.getCanPreviousPage()) return;
           table.setPageIndex(0);
         },
         children: /* @__PURE__ */ jsx66(ChevronDoubleLeftIcon, { width: 24, height: 24 })
@@ -5623,8 +5612,7 @@ var Pagination = ({
         variant: "default",
         disabled: !table.getCanPreviousPage(),
         onClick: () => {
-          if (!table.getCanPreviousPage())
-            return;
+          if (!table.getCanPreviousPage()) return;
           table.previousPage();
         },
         children: /* @__PURE__ */ jsx66(ChevronLeftIcon2, { width: 24, height: 24 })
@@ -5681,8 +5669,7 @@ var TableView = ({
     return headerGroups.map((headerGroup) => {
       const headers = headerGroup.headers;
       return /* @__PURE__ */ jsx67("tr", { className: "first:hidden", children: headers.map((header) => {
-        if (header.isPlaceholder)
-          return false;
+        if (header.isPlaceholder) return false;
         return /* @__PURE__ */ jsx67(
           "th",
           {
@@ -5750,7 +5737,7 @@ var DeleteTenant = ({
 }) => {
   const { toast: toast4 } = useToast2();
   const [open, setOpen] = useState16(false);
-  const onYesEvent = () => __async(void 0, null, function* () {
+  const onYesEvent = () => __async(null, null, function* () {
     try {
       yield TenantService3.tenantDelete(tenantId);
       toast4({
@@ -5833,8 +5820,7 @@ var SearchInput = ({ onUpdate, value }) => {
     [onUpdate]
   );
   useEffect12(() => {
-    if (searchStr)
-      onUpdate(searchStr);
+    if (searchStr) onUpdate(searchStr);
   }, [onUpdate, searchStr]);
   useEffect12(() => {
     var _a;
@@ -6008,7 +5994,7 @@ var AddUser = ({ showButtonAdd }) => {
   const { toast: toast4 } = useToast2();
   const queryClient = useQueryClient9();
   const { handleSubmit, register } = useForm10();
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     const user = data;
     user.isActive = isActive;
     user.lockoutEnabled = lockoutEnabled;
@@ -6128,7 +6114,7 @@ var DeleteUser = ({
 }) => {
   const { toast: toast4 } = useToast2();
   const [open, setOpen] = useState21(false);
-  const onYesEvent = () => __async(void 0, null, function* () {
+  const onYesEvent = () => __async(null, null, function* () {
     try {
       yield UserService2.userDelete(userId);
       toast4({
@@ -6167,7 +6153,7 @@ var DeleteUser = ({
 
 // src/components/User/UserDropDown.tsx
 import Link3 from "next/link";
-import { useSession as useSession2 } from "next-auth/react";
+import { useSession as useSession2 } from "@geowiki/core";
 import { useMemo as useMemo2 } from "react";
 import { v4 as v44 } from "uuid";
 import { useCurrentUser } from "@geowiki/core";
@@ -6392,6 +6378,13 @@ var TABS_NAME = {
   USERS_ROLE_ASSIGN: "user_role_assign",
   USERS_EVO_PROJECTS: "users_evo_projects"
 };
+function formatUserAlias(userName) {
+  var _a, _b;
+  const parts = userName.split("_");
+  const first = ((_b = (_a = parts[0].at(0)) == null ? void 0 : _a.toUpperCase()) != null ? _b : "") + parts[0].substring(1);
+  if (!parts[1]) return first;
+  return first + "(" + parts[1].toUpperCase() + ")";
+}
 var UserEdit = ({ userDto, userId, onDismiss }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const [open, setOpen] = useState22(false);
@@ -6403,12 +6396,7 @@ var UserEdit = ({ userDto, userId, onDismiss }) => {
   const assignableRoles = useAssignableRoles();
   const [refreshData, setRefreshData] = useState22(true);
   const [updateUserProject, setUpdateUserProject] = useState22(false);
-  const [userAlias, setUserAlias] = useState22(() => {
-    var _a2;
-    var user_alias = userDto.userName.split("_");
-    var user_alias_name = ((_a2 = user_alias[0].at(0)) == null ? void 0 : _a2.toUpperCase()) + user_alias[0].substring(1, user_alias[0].length) + "(" + user_alias[1].toUpperCase() + ")";
-    return user_alias_name;
-  });
+  const [userAlias, setUserAlias] = useState22(() => formatUserAlias(userDto.userName));
   const { theme } = useTheme();
   const { data: projects } = useProjects(evolandFeature, 0, 50);
   const { data: userCurrentProject } = useGetUserProject(
@@ -6458,24 +6446,17 @@ var UserEdit = ({ userDto, userId, onDismiss }) => {
     setRefreshData(false);
   };
   if ((updateUserRoleProjectResult == null ? void 0 : updateUserRoleProjectResult.success) == true) {
-    if (userAlias != "")
-      setUserAlias("");
-    if (userProjectRole.length != 0)
-      setUserProjectRole([]);
+    if (userAlias != "") setUserAlias("");
+    if (userProjectRole.length != 0) setUserProjectRole([]);
   }
   if (setUserDetail && setUserDetail.success == true) {
-    if (contractStartDate != "")
-      setContractStartDate("");
-    if (contractEndDate != "")
-      setContractEndDate("");
+    if (contractStartDate != "") setContractStartDate("");
+    if (contractEndDate != "") setContractEndDate("");
     setUpdateUserDetail(false);
     setRefreshData(false);
   }
-  const updateUserRoleProject = () => __async(void 0, null, function* () {
-    var _a2;
-    var user_alias = userDto.userName.split("_");
-    var user_alias_name = ((_a2 = user_alias[0].at(0)) == null ? void 0 : _a2.toUpperCase()) + user_alias[0].substring(1, user_alias[0].length) + "(" + user_alias[1].toUpperCase() + ")";
-    setUserAlias(user_alias_name);
+  const updateUserRoleProject = () => __async(null, null, function* () {
+    setUserAlias(formatUserAlias(userDto.userName));
     setUpdateUserProject(true);
   });
   const columns = [
@@ -6524,17 +6505,14 @@ var UserEdit = ({ userDto, userId, onDismiss }) => {
   const paginationComponentOptions = {
     noRowsPerPage: true
   };
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     const user = data;
     try {
       if (evolandFeature) {
-        if (!updateUserProject)
-          yield updateUserRoleProject();
+        if (!updateUserProject) yield updateUserRoleProject();
         if (userCurrentProject && (userCurrentProject[0].contract_start_date != contractStartDate || userCurrentProject[0].contract_end_date != contractEndDate)) {
-          if (contractStartDate == "")
-            setContractStartDate(null);
-          if (contractEndDate == "")
-            setContractEndDate(null);
+          if (contractStartDate == "") setContractStartDate(null);
+          if (contractEndDate == "") setContractEndDate(null);
           if ((contractStartDate == "" || !contractStartDate) && contractEndDate || contractEndDate && contractStartDate && new Date(contractEndDate) < new Date(contractEndDate)) {
             alert("Please provide correct date");
             return;
@@ -6562,14 +6540,10 @@ var UserEdit = ({ userDto, userId, onDismiss }) => {
   });
   const onCloseEvent = () => {
     setOpen(false);
-    if (userAlias != "")
-      setUserAlias("");
-    if (userProjectRole.length != 0)
-      setUserProjectRole([]);
-    if (contractStartDate != "")
-      setContractStartDate("");
-    if (contractEndDate != "")
-      setContractEndDate("");
+    if (userAlias != "") setUserAlias("");
+    if (userProjectRole.length != 0) setUserProjectRole([]);
+    if (contractStartDate != "") setContractStartDate("");
+    if (contractEndDate != "") setContractEndDate("");
     onDismiss();
   };
   useEffect14(() => {
@@ -6601,7 +6575,7 @@ var UserEdit = ({ userDto, userId, onDismiss }) => {
     },
     [roles]
   );
-  const onRoleAssignedSaveEvent = (e) => __async(void 0, null, function* () {
+  const onRoleAssignedSaveEvent = (e) => __async(null, null, function* () {
     var _a2;
     e.preventDefault();
     const updateUserDto = __spreadProps(__spreadValues({}, userDto), {
@@ -6686,8 +6660,7 @@ var UserEdit = ({ userDto, userId, onDismiss }) => {
                 onChange: (e) => {
                   if ((contractStartDate == "" || !contractStartDate) && e.target.value !== "" || new Date(contractStartDate) > new Date(e.target.value))
                     alert("Please provide correct start date");
-                  else
-                    setContractEndDate(e.target.value);
+                  else setContractEndDate(e.target.value);
                 }
               })
             )
@@ -7021,8 +6994,7 @@ var UserPermission = ({
         var _a;
         return (_a = g.permissions) == null ? void 0 : _a.every((p) => p.isGranted);
       }).every((e) => e);
-      if (hasAllPermissionGranted)
-        setHasAllGranted(hasAllPermissionGranted);
+      if (hasAllPermissionGranted) setHasAllGranted(hasAllPermissionGranted);
     }
   }, [permissionGroups]);
   useEffect16(() => {
@@ -7086,7 +7058,7 @@ var UserPermission = ({
     [hasAllGranted, permissionGroups]
   );
   const onSubmit = useCallback7(
-    (e) => __async(void 0, null, function* () {
+    (e) => __async(null, null, function* () {
       e.preventDefault();
       const payload = permissionGroups == null ? void 0 : permissionGroups.map(
         (p) => p.permissions.map((grant) => ({
@@ -7381,7 +7353,7 @@ var UserList = ({
 };
 
 // src/components/User/UserMenus.tsx
-import { signIn as signIn3, useSession as useSession3 } from "next-auth/react";
+import { signIn as signIn3, useSession as useSession3 } from "@geowiki/core";
 import { getCookie } from "cookies-next";
 import { jsx as jsx82, jsxs as jsxs51 } from "react/jsx-runtime";
 var UserMenus = ({}) => {
@@ -7398,9 +7370,8 @@ var UserMenus = ({}) => {
           size: "sm",
           className: "w-full mt-2 sm:w-1/2 sm:mt-0",
           onClick: () => {
-            signIn3("openiddict", void 0, {
+            signIn3(void 0, void 0, {
               __tenant: getCookie("__tenant")
-              // prompt: "login",
             });
           },
           children: "Login"
@@ -7430,7 +7401,7 @@ var DeleteRole = ({
 }) => {
   const { toast: toast4 } = useToast2();
   const [open, setOpen] = useState26(false);
-  const onYesEvent = () => __async(void 0, null, function* () {
+  const onYesEvent = () => __async(null, null, function* () {
     try {
       yield RoleService.roleDelete(roleId);
       toast4({
@@ -7481,7 +7452,7 @@ var RoleEdit = ({ roleDto, roleId, onDismiss }) => {
   const { handleSubmit, register } = useForm12();
   const [isDefault, setIsDefault] = useState27(roleDto.isDefault);
   const [isPublic, setIsPublic] = useState27(roleDto.isPublic);
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     const role = data;
     role.isDefault = isDefault;
     role.isPublic = isPublic;
@@ -7633,8 +7604,7 @@ var RolePermission = ({ roleDto, onDismiss }) => {
         var _a;
         return (_a = g.permissions) == null ? void 0 : _a.every((p) => p.isGranted);
       }).every((e) => e);
-      if (hasAllPermissionGranted)
-        setHasAllGranted(hasAllPermissionGranted);
+      if (hasAllPermissionGranted) setHasAllGranted(hasAllPermissionGranted);
     }
   }, [permissionGroups]);
   useEffect19(() => {
@@ -7698,7 +7668,7 @@ var RolePermission = ({ roleDto, onDismiss }) => {
     [hasAllGranted, permissionGroups]
   );
   const onSubmit = useCallback8(
-    (e) => __async(void 0, null, function* () {
+    (e) => __async(null, null, function* () {
       e.preventDefault();
       const payload = permissionGroups == null ? void 0 : permissionGroups.map(
         (p) => p.permissions.map((grant) => ({
@@ -8005,7 +7975,7 @@ var AddRole = ({ showButtonAdd }) => {
   const { toast: toast4 } = useToast2();
   const { handleSubmit, register } = useForm13();
   const queryClient = useQueryClient14();
-  const onSubmit = (data) => __async(void 0, null, function* () {
+  const onSubmit = (data) => __async(null, null, function* () {
     const newRole = data;
     newRole.isDefault = isDefault;
     newRole.isPublic = isPublic;
@@ -8273,7 +8243,7 @@ var AccordionContent2 = forwardRef40((_a, ref) => {
 AccordionContent2.displayName = AccordionPrimitive2.Content.displayName;
 
 // src/components/Admin/Sidebar.tsx
-import { useRouter as useRouter2 } from "next/router";
+import { useRouter } from "next/router";
 import { useCallback as useCallback9 } from "react";
 
 // src/components/Shared/Image.tsx
@@ -8297,13 +8267,11 @@ import { useCurrentUser as useCurrentUser2 } from "@geowiki/core";
 import { Fragment as Fragment17, jsx as jsx93 } from "react/jsx-runtime";
 var RequireRole = ({ roles, children }) => {
   const currentUser = useCurrentUser2();
-  if (!currentUser)
-    return null;
+  if (!currentUser) return null;
   if (!(roles == null ? void 0 : roles.some((role) => {
     var _a;
     return (_a = currentUser.roles) == null ? void 0 : _a.includes(role);
-  })))
-    return null;
+  }))) return null;
   return /* @__PURE__ */ jsx93(Fragment17, { children });
 };
 
@@ -8461,14 +8429,13 @@ var Sidebar = ({
   generalSettings
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  const router = useRouter2();
+  const router = useRouter();
   const { data: appConfig, isLoading: isAppConfigLoading } = useAppConfig2();
   const getDefaultValue = useCallback9(
     (menu) => {
       var _a2;
       const m = (_a2 = menu.children) == null ? void 0 : _a2.find((c) => c.link === (router == null ? void 0 : router.asPath));
-      if (m)
-        return menu.name;
+      if (m) return menu.name;
       return "";
     },
     [router == null ? void 0 : router.asPath]
@@ -8561,11 +8528,11 @@ var Sidebar = ({
 
 // src/components/Layouts/AdminLayout.tsx
 import { Bars3Icon as Bars3Icon2, ChevronLeftIcon as ChevronLeftIcon4 } from "@heroicons/react/24/solid";
-import { useCurrentUser as useCurrentUser3 } from "@geowiki/core";
+import { useCurrentUser as useCurrentUser3, useSession as useSession4 } from "@geowiki/core";
 
 // src/components/Shared/auth/AuthenticationFailure.tsx
 import { useEffect as useEffect20, useState as useState31 } from "react";
-import { signIn as signIn4 } from "next-auth/react";
+import { signIn as signIn4 } from "@geowiki/core";
 import { jsx as jsx99, jsxs as jsxs61 } from "react/jsx-runtime";
 var AuthenticationFailure = ({}) => {
   const [open, setOpen] = useState31(false);
@@ -8593,7 +8560,7 @@ var AuthenticationFailure = ({}) => {
         Button,
         {
           onClick: () => {
-            signIn4("openiddict");
+            signIn4();
           },
           variant: "default",
           children: "Login"
@@ -8613,11 +8580,12 @@ var AdminLayout = ({
   var _a, _b, _c, _d, _e;
   const [toggleSidebar, setToggleSidebar] = useState32(false);
   const currentUser = useCurrentUser3();
+  const { status: sessionStatus } = useSession4();
   const cmsUrl = (_b = (_a = generalSettings == null ? void 0 : generalSettings.GeoWikiSettings) == null ? void 0 : _a.Host) == null ? void 0 : _b.Text;
   var favicon = (_e = (_d = (_c = generalSettings == null ? void 0 : generalSettings.GeoWikiSettings) == null ? void 0 : _c.FavIcon) == null ? void 0 : _d.Paths) == null ? void 0 : _e[0];
   const faviconPath = cmsUrl + "/media/" + favicon;
   return /* @__PURE__ */ jsxs62("main", { children: [
-    currentUser && !(currentUser == null ? void 0 : currentUser.isAuthenticated) && /* @__PURE__ */ jsx100(AuthenticationFailure, {}),
+    sessionStatus === "unauthenticated" && currentUser && !(currentUser == null ? void 0 : currentUser.isAuthenticated) && /* @__PURE__ */ jsx100(AuthenticationFailure, {}),
     /* @__PURE__ */ jsx100(Head, { children: favicon && /* @__PURE__ */ jsx100("link", { rel: "icon", href: faviconPath }) }),
     /* @__PURE__ */ jsx100(
       Sidebar,
@@ -8856,8 +8824,7 @@ var CustomDropDown = (props) => {
     }
     return null;
   });
-  if (IsConfigSettingsLoaded)
-    return /* @__PURE__ */ jsx105(LoaderFull, {});
+  if (IsConfigSettingsLoaded) return /* @__PURE__ */ jsx105(LoaderFull, {});
   return /* @__PURE__ */ jsx105(
     AsyncSelect,
     {
@@ -9000,11 +8967,9 @@ var CustomFilterSort = (props) => {
           LabelLookUp: item.LabelLookUp,
           Parameter: item.Parameter,
           onValueChange: (currentvalue) => {
-            if ((currentvalue == null ? void 0 : currentvalue.value) != void 0)
-              skip = 0;
+            if ((currentvalue == null ? void 0 : currentvalue.value) != void 0) skip = 0;
             filterValues[item == null ? void 0 : item.Name.replace(new RegExp(" ", "g"), "")] = currentvalue == null ? void 0 : currentvalue.value;
-            if (!props.showButtons)
-              onSearch();
+            if (!props.showButtons) onSearch();
           }
         },
         index
@@ -9074,8 +9039,7 @@ import { jsx as jsx107, jsxs as jsxs67 } from "react/jsx-runtime";
 var InfoCard = (props) => {
   var _a;
   var { data: ConfigSettings, isLoading: IsConfigSettingsLoaded } = useConfigSettings2();
-  if (IsConfigSettingsLoaded)
-    return /* @__PURE__ */ jsx107(LoaderFull, {});
+  if (IsConfigSettingsLoaded) return /* @__PURE__ */ jsx107(LoaderFull, {});
   return /* @__PURE__ */ jsx107(
     motion2.li,
     {
@@ -9490,8 +9454,7 @@ var CmsImage = ({
   showPlaceholder = true
 }) => {
   var { data: cmsImageUrl, isLoading } = useCmsImage(src);
-  if (isLoading)
-    return null;
+  if (isLoading) return null;
   if (width && height) {
     if (!showPlaceholder)
       return /* @__PURE__ */ jsx120(
@@ -10486,8 +10449,8 @@ var RichTextContent = (props) => {
   const [hasContent, setHasContent] = useState36(
     props.defaultValue ? true : false
   );
-  const loadQuill = () => __async(void 0, null, function* () {
-    return new Promise((resolve) => __async(void 0, null, function* () {
+  const loadQuill = () => __async(null, null, function* () {
+    return new Promise((resolve) => __async(null, null, function* () {
       const Quill = yield __require("react-quill").Quill;
       const BlotFormatter = (yield __require("quill-blot-formatter")).default;
       resolve({ Quill, BlotFormatter });
@@ -10681,8 +10644,7 @@ var PrimaryButton = (props) => {
 import Link9 from "next/link";
 import { jsx as jsx144 } from "react/jsx-runtime";
 var ButtonList = ({ data }) => {
-  if (!data)
-    return null;
+  if (!data) return null;
   return data == null ? void 0 : data.map((button) => {
     var _a;
     return /* @__PURE__ */ jsx144(Button, { children: /* @__PURE__ */ jsx144(
@@ -10705,11 +10667,11 @@ var FullPageLoader = ({ show }) => {
 };
 
 // src/components/Shared/Error.tsx
-import { useRouter as useRouter3 } from "next/router";
+import { useRouter as useRouter2 } from "next/router";
 import Image4 from "next/image";
 import { jsx as jsx146, jsxs as jsxs90 } from "react/jsx-runtime";
 var Error2 = () => {
-  const router = useRouter3();
+  const router = useRouter2();
   return /* @__PURE__ */ jsxs90("div", { className: "lg:px-24 lg:py-24 md:py-20 md:px-44 px-4 py-24 items-center flex justify-center flex-col-reverse lg:flex-row md:gap-28 gap-1 bg-base-200", children: [
     /* @__PURE__ */ jsx146("div", { className: "w-full xl:w-1/2 relative lg:pb-0", children: /* @__PURE__ */ jsx146("div", { className: "relative", children: /* @__PURE__ */ jsxs90("div", { className: "absolute", children: [
       /* @__PURE__ */ jsx146("h1", { className: "my-2 text-primary font-bold text-2xl", children: "Looks like you've found the doorway to the great nothing" }),
@@ -10894,7 +10856,7 @@ var NewsArticle = (props) => {
 };
 
 // src/components/News/NewsItemList.tsx
-import { useRouter as useRouter4 } from "next/router";
+import { useRouter as useRouter3 } from "next/router";
 import { v4 as v49 } from "uuid";
 import { Fragment as Fragment20, jsx as jsx150, jsxs as jsxs94 } from "react/jsx-runtime";
 var NewsItemList = ({ newsItems }) => {
@@ -10903,7 +10865,7 @@ var NewsItemList = ({ newsItems }) => {
     { key: "en", value: "English" },
     { key: "fr", value: "Fran\xE7ais" }
   ];
-  const router = useRouter4();
+  const router = useRouter3();
   const { lang } = router.query;
   var currentLang = "all";
   if (lang) {
@@ -11100,7 +11062,7 @@ import dynamic2 from "next/dynamic";
 import { useState as useState40 } from "react";
 import { jsx as jsx156, jsxs as jsxs98 } from "react/jsx-runtime";
 var MapWithNoSSR = dynamic2(
-  () => import("./cluster-map-OI3WRJJ7.mjs").then((x) => x.FarmerClusterMap),
+  () => import("./cluster-map-CWAOD7E2.mjs").then((x) => x.FarmerClusterMap),
   {
     ssr: false
   }
@@ -11299,7 +11261,7 @@ import { useForm as useForm15 } from "react-hook-form";
 import { ProfileService as ProfileService5 } from "@geowiki/api-proxy";
 import Swal from "sweetalert2";
 import { EyeIcon, EyeSlashIcon } from "@heroicons/react/24/outline";
-import { useRouter as useRouter5 } from "next/router";
+import { useRouter as useRouter4 } from "next/router";
 import { jsx as jsx160, jsxs as jsxs102 } from "react/jsx-runtime";
 var UpdatePassword = (props) => {
   const {
@@ -11312,7 +11274,7 @@ var UpdatePassword = (props) => {
   const [ConfirmPassword, setConfirmPassword] = useState41(false);
   const [CurrentPasswordType, setCurrentPasswordType] = useState41("password");
   const [NewPasswordType, setNewPasswordType] = useState41("password");
-  const router = useRouter5();
+  const router = useRouter4();
   const onPasswordChange = (key, value) => {
     if (key !== "confirmnewPassword")
       setPasswordData(() => {
@@ -11329,7 +11291,7 @@ var UpdatePassword = (props) => {
       reset({ confirmnewPassword: null });
     }
   };
-  const onPasswordSubmit = () => __async(void 0, null, function* () {
+  const onPasswordSubmit = () => __async(null, null, function* () {
     try {
       yield ProfileService5.profileChangePassword(PasswordData);
       Swal.fire({
@@ -11530,7 +11492,7 @@ var UpdateUserProfile = ({
       });
     });
   };
-  const onProfileSubmit = () => __async(void 0, null, function* () {
+  const onProfileSubmit = () => __async(null, null, function* () {
     var result = yield ProfileService6.profileUpdate(UserData);
     if (result.name === UserData.name && result.surname === UserData.surname) {
       Swal2.fire({
@@ -11637,7 +11599,7 @@ import { toast as toast3 } from "react-toastify";
 import { jsx as jsx162, jsxs as jsxs104 } from "react/jsx-runtime";
 var SettingsItem = (props) => {
   const [value, setValue] = useState43(props.value);
-  const handleUpdateSettings = () => __async(void 0, null, function* () {
+  const handleUpdateSettings = () => __async(null, null, function* () {
     try {
       yield SettingsService.settingsSetSettingForTenant(props.setting, value);
       toast3.success("Settings updated");
@@ -11683,8 +11645,7 @@ import { jsx as jsx163, jsxs as jsxs105 } from "react/jsx-runtime";
 var SettingsManagement = () => {
   var _a;
   var { data, isLoading } = useAppConfig3();
-  if (isLoading)
-    return /* @__PURE__ */ jsx163("div", { children: "Loading..." });
+  if (isLoading) return /* @__PURE__ */ jsx163("div", { children: "Loading..." });
   const keys = Object == null ? void 0 : Object.keys((_a = data == null ? void 0 : data.setting) == null ? void 0 : _a.values);
   let settings = {
     GeoWiki: keys.filter((key) => key.startsWith("GeoWiki")),
@@ -11695,10 +11656,8 @@ var SettingsManagement = () => {
       return key.startsWith((_a2 = data == null ? void 0 : data.currentTenant) == null ? void 0 : _a2.name);
     })
   };
-  if (!data)
-    return /* @__PURE__ */ jsx163("div", { children: "no data" });
-  if (!keys)
-    return /* @__PURE__ */ jsx163("div", { children: "no keys" });
+  if (!data) return /* @__PURE__ */ jsx163("div", { children: "no data" });
+  if (!keys) return /* @__PURE__ */ jsx163("div", { children: "no keys" });
   return /* @__PURE__ */ jsx163("div", { children: /* @__PURE__ */ jsx163("div", { className: "w-full px-2 py-16 sm:px-0", children: /* @__PURE__ */ jsxs105(Tab.Group, { children: [
     /* @__PURE__ */ jsx163(Tab.List, { className: "flex p-1 space-x-1  rounded-xl", children: Object.keys(settings).map(
       (key) => settings[key].length > 0 && /* @__PURE__ */ jsx163(
@@ -12008,13 +11967,11 @@ var VersionDisplay = () => {
   const [version, setVersion] = useState44();
   useEffect25(() => {
     fetch("/version.json").then((res) => {
-      if (!res.ok)
-        throw new Error("Version file not found");
+      if (!res.ok) throw new Error("Version file not found");
       return res.json();
     }).then((data) => setVersion(data.version)).catch(() => setVersion(void 0));
   }, []);
-  if (!version)
-    return null;
+  if (!version) return null;
   return /* @__PURE__ */ jsxs108("div", { className: "text-grey text-sm lg:text-base font-normal leading-[130%]", children: [
     "Version: ",
     version
@@ -12154,7 +12111,7 @@ var DesignFooter = (props) => {
 // src/components/DesignElements/header.tsx
 import { useState as useState45 } from "react";
 import { Dialog as Dialog8, Popover as Popover3 } from "@headlessui/react";
-import { signIn as signIn5, signOut } from "next-auth/react";
+import { signIn as signIn5, signOut as signOut2 } from "@geowiki/core";
 import { Bars3Icon as Bars3Icon3, XMarkIcon as XMarkIcon5 } from "@heroicons/react/24/outline";
 import { ChevronDownIcon as ChevronDownIcon2 } from "@heroicons/react/20/solid";
 import Link13 from "next/link";
@@ -12377,7 +12334,7 @@ var DesignHeader = ({
                     {
                       variant: "secondary",
                       size: "sm",
-                      onClick: () => signIn5("openiddict"),
+                      onClick: () => signIn5(),
                       children: "Login"
                     }
                   ),
@@ -12403,11 +12360,7 @@ var DesignHeader = ({
                     {
                       variant: "secondary",
                       size: "sm",
-                      onClick: () => {
-                        signOut({ redirect: false }).then(() => {
-                          window.location.href = "/logout";
-                        });
-                      },
+                      onClick: () => signOut2(),
                       children: "Logout"
                     }
                   )
@@ -12539,9 +12492,7 @@ var DesignHeader = ({
                           className: "text-base font-medium text-gray-900 hover:text-gray-700 transition-colors duration-200",
                           onClick: () => {
                             setMobileMenuOpen(false);
-                            signOut({ redirect: false }).then(() => {
-                              window.location.href = "/logout";
-                            });
+                            signOut2();
                           },
                           children: "Logout"
                         }
@@ -12900,11 +12851,11 @@ var DesignResultTag = ({ tag, name }) => {
 };
 
 // src/components/DesignElements/sort.tsx
-import { useRouter as useRouter6 } from "next/router";
+import { useRouter as useRouter5 } from "next/router";
 import { useState as useState48, useEffect as useEffect27 } from "react";
 import { jsx as jsx177, jsxs as jsxs117 } from "react/jsx-runtime";
 var DesignSort = ({ totalCount, name }) => {
-  const router = useRouter6();
+  const router = useRouter5();
   const sortingTypes = ["Most recent", "Old to new"];
   const [value, setValue] = useState48("Most recent");
   useEffect27(() => {
@@ -12948,14 +12899,14 @@ var DesignSort = ({ totalCount, name }) => {
 // src/components/DesignElements/filterDropdown.tsx
 import { Disclosure as Disclosure2 } from "@headlessui/react";
 import { ChevronDown as ChevronDown6 } from "lucide-react";
-import { useRouter as useRouter7 } from "next/router";
+import { useRouter as useRouter6 } from "next/router";
 import { Fragment as Fragment24, jsx as jsx178, jsxs as jsxs118 } from "react/jsx-runtime";
 var FilterDropdown = ({
   name,
   filterKey,
   sortItems
 }) => {
-  const router = useRouter7();
+  const router = useRouter6();
   const filterValue = router.query[filterKey];
   const filterValues = (filterValue == null ? void 0 : filterValue.toString().split(",")) || [];
   const handleCheckboxChange = (e, selectedItem) => {
@@ -13398,8 +13349,7 @@ import { jsx as jsx188, jsxs as jsxs126 } from "react/jsx-runtime";
 var ListTagsGroup = ({ cluster }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
   var { data: ConfigSettings, isLoading: IsConfigSettingsLoaded } = useConfigSettings3();
-  if (IsConfigSettingsLoaded)
-    return /* @__PURE__ */ jsx188(LoaderFull, {});
+  if (IsConfigSettingsLoaded) return /* @__PURE__ */ jsx188(LoaderFull, {});
   return /* @__PURE__ */ jsxs126("div", { className: "space-y-6 lg:space-y-10", children: [
     /* @__PURE__ */ jsx188(
       TagsGroup,
@@ -13567,8 +13517,7 @@ var ApiImage = ({
   height = 0
 }) => {
   var { data, isLoading } = useApiImage(imageId);
-  if (isLoading)
-    return null;
+  if (isLoading) return null;
   if (width > 0 && height > 0) {
     return /* @__PURE__ */ jsx189(
       Image5,
@@ -13657,13 +13606,13 @@ var SignUpBanner = ({
 };
 
 // src/components/DesignElements/RoutePagination.tsx
-import { useRouter as useRouter8 } from "next/router";
+import { useRouter as useRouter7 } from "next/router";
 import { jsx as jsx191 } from "react/jsx-runtime";
 var RoutePagination = ({
   pageSize,
   total
 }) => {
-  const router = useRouter8();
+  const router = useRouter7();
   const { page } = router.query;
   const currentPage = parseInt(page) || 1;
   return /* @__PURE__ */ jsx191("div", { children: /* @__PURE__ */ jsx191(
@@ -13812,7 +13761,7 @@ import { useState as useState51 } from "react";
 import { Fragment as Fragment25 } from "react";
 import { Dialog as Dialog9, Transition as Transition6 } from "@headlessui/react";
 import { ArrowLeftIcon, CheckIcon as CheckIcon2 } from "@heroicons/react/24/outline";
-import { useRouter as useRouter9 } from "next/router";
+import { useRouter as useRouter8 } from "next/router";
 import { v4 as v413 } from "uuid";
 import { jsx as jsx195, jsxs as jsxs131 } from "react/jsx-runtime";
 function MobileFilterPopupOpened({
@@ -13824,7 +13773,7 @@ function MobileFilterPopupOpened({
   routerFiltername,
   isMultiSelect
 }) {
-  const router = useRouter9();
+  const router = useRouter8();
   const queryValue = router.query[routerFiltername];
   const checkValues = typeof queryValue === "string" ? queryValue.split(",") : Array.isArray(queryValue) ? queryValue : [];
   const handleShowResults = () => {
@@ -13948,7 +13897,7 @@ function MobileFilterPopupOpened({
 }
 
 // src/components/DesignElements/MobileFilterPopup.tsx
-import { useRouter as useRouter10 } from "next/router";
+import { useRouter as useRouter9 } from "next/router";
 import { jsx as jsx196, jsxs as jsxs132 } from "react/jsx-runtime";
 function MobileFilterPopup({
   open,
@@ -13957,7 +13906,7 @@ function MobileFilterPopup({
   filters,
   isMultiSelect
 }) {
-  const router = useRouter10();
+  const router = useRouter9();
   const [openStates, setOpenStates] = useState51(
     filters.reduce((acc, filter) => {
       acc[filter.filterName] = false;
@@ -14382,10 +14331,8 @@ var ClusterNews = ({
       path: clusterNewsItem.imageId === "00000000-0000-0000-0000-000000000000" ? "/assets/img/noImage.png" : clusterNewsItem.imageId
     };
   });
-  if (isLoading)
-    return /* @__PURE__ */ jsx204(LocalLoader, {});
-  if (publishedItems.length == 0)
-    return null;
+  if (isLoading) return /* @__PURE__ */ jsx204(LocalLoader, {});
+  if (publishedItems.length == 0) return null;
   return /* @__PURE__ */ jsx204(Fragment27, { children: !isLoading && /* @__PURE__ */ jsx204("div", { className: "bg-grey-lightest lg:mt-[100px]", children: /* @__PURE__ */ jsx204("div", { className: "bg-grey-lightest mx-5 lg:mx-12", children: /* @__PURE__ */ jsxs137("div", { className: "container mx-auto space-y-6 py-6 lg:space-y-10 lg:py-16 px-0 lg:px-10 ", children: [
     /* @__PURE__ */ jsxs137("div", { className: "lg:flex lg:justify-between lg:items-end", children: [
       /* @__PURE__ */ jsx204(H4Design, { className: "pb-4 lg:pb-0", children: "Cluster News" }),
@@ -14541,8 +14488,7 @@ import { useCountries } from "@geowiki/core";
 import { jsx as jsx208, jsxs as jsxs139 } from "react/jsx-runtime";
 var H3Clusters = ({ clusters }) => {
   const { data: countries, isLoading: isCountriesLoading } = useCountries();
-  if (isCountriesLoading)
-    return /* @__PURE__ */ jsx208("div", { children: "Loading..." });
+  if (isCountriesLoading) return /* @__PURE__ */ jsx208("div", { children: "Loading..." });
   return /* @__PURE__ */ jsxs139("div", { className: "lg:container mx-auto space-y-6 lg:space-y-10 ", children: [
     /* @__PURE__ */ jsxs139("div", { className: "lg:flex lg:justify-between lg:items-end", children: [
       /* @__PURE__ */ jsx208(H4Design, { className: "pb-4 lg:pb-0", children: "Explore other Farmer Clusters" }),
@@ -15245,8 +15191,7 @@ var SubtitleH3Cluster4Column = ({
     4
   );
   const { data: countries, isLoading: isCountriesLoading } = useCountries2();
-  if (isClusterLoading || isCountriesLoading)
-    return /* @__PURE__ */ jsx224("div", { children: "Loading..." });
+  if (isClusterLoading || isCountriesLoading) return /* @__PURE__ */ jsx224("div", { children: "Loading..." });
   return /* @__PURE__ */ jsxs154(
     "div",
     {
@@ -16873,7 +16818,7 @@ import { useState as useState56 } from "react";
 import { useForm as useForm18 } from "react-hook-form";
 import { zodResolver as zodResolver3 } from "@hookform/resolvers/zod";
 import * as z3 from "zod";
-import { useRouter as useRouter11 } from "next/router";
+import { useRouter as useRouter10 } from "next/router";
 import { AccountService } from "@geowiki/api-proxy";
 import { useDefaultSettings } from "@geowiki/core";
 import { jsx as jsx265, jsxs as jsxs170 } from "react/jsx-runtime";
@@ -16897,7 +16842,7 @@ function RegisterForm({
   className
 }) {
   var _a, _b, _c, _d, _e, _f;
-  const router = useRouter11();
+  const router = useRouter10();
   const [error, setError] = useState56(null);
   const [isLoading, setIsLoading] = useState56(false);
   const [success, setSuccess] = useState56(false);