- {objectToEdit && data ?
+ {objectToEdit && data?.data && objectToEdit ?
@@ -308,7 +289,7 @@ const ViewProduct = () => {
- {isLoading ? : }
+ {isLoading && objectToEdit ? : }
diff --git a/src/Pages/Products/View/FormikTab/VariableTabs.tsx b/src/Pages/Products/View/FormikTab/VariableTabs.tsx
index fd5625c..578fde1 100644
--- a/src/Pages/Products/View/FormikTab/VariableTabs.tsx
+++ b/src/Pages/Products/View/FormikTab/VariableTabs.tsx
@@ -50,11 +50,17 @@ export const VariableTabs: React.FC = ({ tabKey }) => {
onChange={handleFieldChange('name_de')}
/>
- */}
+
{values?.category_id &&
@@ -79,12 +85,7 @@ export const VariableTabs: React.FC = ({ tabKey }) => {
value={FormikName("description_de")}
onChange={handleFieldChange('description_de')}
/>
-
+
diff --git a/src/Pages/Products/formUtil.ts b/src/Pages/Products/formUtil.ts
index 6dd28bb..975ec2a 100644
--- a/src/Pages/Products/formUtil.ts
+++ b/src/Pages/Products/formUtil.ts
@@ -5,17 +5,18 @@ import { ImageBaseURL } from "../../api/config";
export const getInitialValues = (objectToEdit: any) => {
- if (!objectToEdit || !objectToEdit.products) {
+ if (!objectToEdit || !objectToEdit?.products) {
return {};
}
- const products = objectToEdit?.products.map((item: any) => {
- if (!item || !item.info) {
- return {};
- }
- const formattedData = Object.entries(item?.info).map(([key, value]) => ({
- [`Description`]: key,
- [`key`]: value,
- }));
+ const products = objectToEdit?.products?.map((item: any) => {
+ console.log(item,"item");
+
+
+ const formattedData = item?.info ? Object.entries(item?.info).map(([key, value], index) => ({
+ [`${index}.Description`]: key,
+ [`${index}.key`]: value,
+ })) : [];
+
return ({
@@ -41,6 +42,9 @@ export const getInitialValues = (objectToEdit: any) => {
[`${index}.Description`]: key,
[`${index}.key`]: value,
}));
+ console.log(products,"products");
+ console.log(objectToEdit,"objectToEdit");
+
return {
id:objectToEdit?.id,
diff --git a/src/Pages/Users/Page.tsx b/src/Pages/Users/Page.tsx
new file mode 100644
index 0000000..2d63c17
--- /dev/null
+++ b/src/Pages/Users/Page.tsx
@@ -0,0 +1,46 @@
+
+import React from 'react'
+import DashBody from '../../Layout/Dashboard/DashBody'
+import DashHeader from '../../Layout/Dashboard/DashHeader'
+import LyTable from '../../Layout/Dashboard/LyTable'
+import useTableColumns from './useTableColumns'
+import { QueryStatusEnum } from '../../config/QueryStatus'
+import { useTranslation } from 'react-i18next'
+import { useNavigate } from 'react-router-dom'
+import AddButton from '../../Layout/Dashboard/AddButton/AddButton'
+import { useGetUsers } from '../../api/users'
+import SearchField from '../../Layout/Dashboard/SearchField'
+
+function Page() {
+
+ const column =useTableColumns()
+ const {data ,status } = useGetUsers()
+ const [t] = useTranslation()
+ const navigate = useNavigate()
+ const totalRows = data?.meta?.total;
+
+ return (
+ // Pass Status to Layout
+
+
+
+
+
+
+ {/*
navigate('/users/add')}> */}
+
+
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+ {/* */}
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default Form
+
+
+
+
diff --git a/src/Pages/Users/SendNotifcation/View/AddPage.tsx b/src/Pages/Users/SendNotifcation/View/AddPage.tsx
new file mode 100644
index 0000000..02f097d
--- /dev/null
+++ b/src/Pages/Users/SendNotifcation/View/AddPage.tsx
@@ -0,0 +1,79 @@
+import React, { useEffect, useState } from 'react'
+import { getInitialValuesForAdd as getInitialValues, getValidationSchema, getDataToSend } from '../formUtil'
+import { Tab, TabList, TabPanel as TabBody, Tabs } from 'react-tabs'
+import 'react-tabs/style/react-tabs.css';
+import { MdLanguage } from 'react-icons/md'
+import ViewPage from '../../../../Layout/Dashboard/ViewPage';
+import { useTranslation } from 'react-i18next';
+import useNavigateOnSuccess from '../../../../Hooks/useNavigateOnSuccess';
+import { useAddUsers } from '../../../../api/users';
+import Form from './AddForm';
+import { useParams } from 'react-router-dom';
+import { useAddNotification } from '../../../../api/notification';
+
+const AddPage = () => {
+
+
+ const { mutate, isLoading, isSuccess } = useAddNotification()
+ const {id} = useParams()
+ const handleSubmit = (values: any) => {
+
+ const body = {
+ en: values.body_en,
+ ar: values.body_ar,
+ du: values.body_de
+ }
+ const meta = {}
+ const title = {
+ en: values.title_en,
+ ar: values.title_ar,
+ du: values.title_de
+ }
+ const dataToSend = {
+ body: JSON.stringify(body),
+ meta: JSON.stringify(meta),
+ title:JSON.stringify(title),
+ user_ids: [id],
+ type: "other",
+
+ };
+
+
+ mutate(dataToSend);
+ };
+
+ const { t } = useTranslation();
+
+ useNavigateOnSuccess(isSuccess, '/users')
+
+
+
+ const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit };
+
+
+ return (
+
+
+
+
+
+
{t("BasicInfo")}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default Form
+
+
+
+
diff --git a/src/Pages/Users/View/AddPage.tsx b/src/Pages/Users/View/AddPage.tsx
new file mode 100644
index 0000000..9d6d788
--- /dev/null
+++ b/src/Pages/Users/View/AddPage.tsx
@@ -0,0 +1,57 @@
+import React, { useEffect, useState } from 'react'
+import { getInitialValuesForAdd as getInitialValues, getValidationSchema, getDataToSend } from '../formUtil'
+import { Tab, TabList, TabPanel as TabBody, Tabs } from 'react-tabs'
+import 'react-tabs/style/react-tabs.css';
+import { MdLanguage } from 'react-icons/md'
+import ViewPage from '../../../Layout/Dashboard/ViewPage';
+import { useTranslation } from 'react-i18next';
+import useNavigateOnSuccess from '../../../Hooks/useNavigateOnSuccess';
+import { useAddUsers } from '../../../api/users';
+import Form from './AddForm';
+
+const AddPage = () => {
+
+
+ const { mutate, isLoading, isSuccess } = useAddUsers()
+ const handleSubmit = (values: any) => {
+
+
+mutate(values)
+
+ };
+
+ const { t } = useTranslation();
+
+ useNavigateOnSuccess(isSuccess, '/users')
+
+
+
+ const ViewProps = { getInitialValues, getValidationSchema, getDataToSend, handleSubmit };
+
+
+ return (
+
+
+
+
+
+
{t("BasicInfo")}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 