From 568f56bf003a67ba632c3aa7ed1ce54947c3ab92 Mon Sep 17 00:00:00 2001 From: Mitchell Magro Date: Mon, 10 Nov 2025 12:30:08 +0100 Subject: [PATCH] Meta Data For User Add dropdown hooked --- app/features/UserRoles/AddUser/AddUser.tsx | 53 ++++++++++++---------- app/redux/metadata/metadataSlice.ts | 1 - 2 files changed, 30 insertions(+), 24 deletions(-) diff --git a/app/features/UserRoles/AddUser/AddUser.tsx b/app/features/UserRoles/AddUser/AddUser.tsx index fc0c146..2e84c2d 100644 --- a/app/features/UserRoles/AddUser/AddUser.tsx +++ b/app/features/UserRoles/AddUser/AddUser.tsx @@ -1,7 +1,6 @@ "use client"; import React, { useState } from "react"; -import { useRouter } from "next/navigation"; import { useDispatch, useSelector } from "react-redux"; import { AppDispatch } from "@/app/redux/store"; import "./AddUser.scss"; @@ -13,6 +12,7 @@ import Spinner from "../../../components/Spinner/Spinner"; import { RootState } from "@/app/redux/store"; import toast from "react-hot-toast"; import Modal from "@/app/components/Modal/Modal"; +import { selectAppMetadata } from "@/app/redux/metadata/selectors"; interface AddUserProps { open: boolean; @@ -20,7 +20,6 @@ interface AddUserProps { } const AddUser: React.FC = ({ open, onClose }) => { - // const router = useRouter(); const dispatch = useDispatch(); const { status, error: authError } = useSelector( (state: RootState) => state.auth @@ -39,6 +38,8 @@ const AddUser: React.FC = ({ open, onClose }) => { const [phoneError, setPhoneError] = useState(""); const [countryCode, setCountryCode] = useState("+1"); + const data = useSelector(selectAppMetadata); + const { merchants = [], groups = [], job_titles = [] } = data || {}; const loading = status === "loading"; @@ -165,8 +166,11 @@ const AddUser: React.FC = ({ open, onClose }) => { className="add-user__select" > - - + {merchants.map((merchant: string) => ( + + ))} {form.merchants.length > 0 && (
@@ -200,10 +204,11 @@ const AddUser: React.FC = ({ open, onClose }) => { className="add-user__select" > - - - - + {groups.map((group: string) => ( + + ))} {form.groups.length > 0 && (
@@ -227,21 +232,23 @@ const AddUser: React.FC = ({ open, onClose }) => {
)}
- +
+ + +