Skip to content

Commit

Permalink
refactor: remove all dynamic APIs
Browse files Browse the repository at this point in the history
  • Loading branch information
@mbappai
mbappai committed Sep 26, 2023
1 parent 9ba1442 commit 5015baf
Show file tree
Hide file tree
Showing 18 changed files with 237 additions and 216 deletions.
45 changes: 27 additions & 18 deletions components/Manager/Banks/BanksView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import dayjs from 'dayjs'
import { ColumnsType, ColumnType, TableProps } from 'antd/lib/table';
import { Bank } from "./Banks.types";
import { usePlacesWidget } from "react-google-autocomplete";
import useUrlPrefix from "../../../hooks/useUrlPrefix";
const {TextArea} = Input


Expand All @@ -31,10 +32,12 @@ export default function BankView(){
const [selectedBank, setSelelectedOrg] = useState<any|Bank>({})
const [currentFilter, setCurrentStatus] = useState({id:'1',name: 'Verified'})

const urlPrefix = useUrlPrefix()

async function fetchBanks(){
const res = await axios({
method:'get',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/manager/org-bank?key=status&value=${currentFilter.id}&pageNumber=${pageNumber}&pageSize=${pageSize}`,
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank?status=${currentFilter.id}&pageNumber=${pageNumber}&pageSize=${pageSize}`,
headers:{
"Authorization": paseto
}
Expand All @@ -47,10 +50,10 @@ export default function BankView(){
async function changeOrgStatus({bankId, statusNumber}:{bankId:string, statusNumber: string}){
const res = await axios({
method:'patch',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/manager/org-bank`,
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank`,
data:{
key:'status',
value: statusNumber, // 0 means de-activated in db
// key:'status',
status: statusNumber, // 0 means de-activated in db
id: bankId
},
headers:{
Expand Down Expand Up @@ -291,10 +294,11 @@ function EditableName({selectedBank}:EditableProp){
setIsEditMode(!isEditMode)
}

const urlPrefix = useUrlPrefix()


const mutationHandler = async(updatedItem:any)=>{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/manager/org-bank`,updatedItem,{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank`,updatedItem,{
headers:{
//@ts-ignore
"Authorization": paseto
Expand All @@ -312,8 +316,8 @@ function EditableName({selectedBank}:EditableProp){

function onFinish(updatedItem:Bank){
const payload = {
key:'bank_name',
value: updatedItem.bankName,
// key:'bank_name',
bankName: updatedItem.bankName,
id: selectedBank.id
}
const updatedRecord = {
Expand Down Expand Up @@ -386,10 +390,12 @@ function EditableAccountNo({selectedBank}:EditableProp){
setIsEditMode(!isEditMode)
}

const urlPrefix = useUrlPrefix()



const mutationHandler = async(updatedItem:any)=>{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/manager/org-bank`,updatedItem,{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank`,updatedItem,{
headers:{
//@ts-ignore
"Authorization": paseto
Expand All @@ -407,8 +413,8 @@ function EditableAccountNo({selectedBank}:EditableProp){

function onFinish(updatedItem:Bank){
const payload = {
key:'account_no',
value: updatedItem.accountNo,
// key:'account_no',
acountNo: updatedItem.accountNo,
id: selectedBank.id
}
const updatedRecord = {
Expand Down Expand Up @@ -502,8 +508,8 @@ function EditableCurrency({selectedBank}:EditableProp){

function onFinish(updatedItem:Bank){
const payload = {
key:'currency',
value: updatedItem.currency,
// key:'currency',
currency: updatedItem.currency,
id: selectedBank.id
}
const updatedRecord = {
Expand Down Expand Up @@ -621,9 +627,10 @@ function EditableAddress({selectedBank}:EditableProp){
},
});

const urlPrefix = useUrlPrefix()

const mutationHandler = async(updatedItem:any)=>{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/manager/org`,updatedItem,{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org`,updatedItem,{
headers:{
//@ts-ignore
"Authorization": paseto
Expand All @@ -641,8 +648,8 @@ function EditableAddress({selectedBank}:EditableProp){

function onFinish(updatedItem:any){
const payload = {
key:'country',
value: updatedItem.country,
// key:'country',
country: updatedItem.country,
orgId: selectedBank.id
}
const updatedRecord = {
Expand Down Expand Up @@ -731,8 +738,10 @@ function EditableAccountType({selectedBank}:EditableProp){
</div>
)

const urlPrefix = useUrlPrefix()

const mutationHandler = async(updatedItem:any)=>{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/manager/org-bank`,updatedItem,{
const {data} = await axios.patch(`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org-bank`,updatedItem,{
headers:{
//@ts-ignore
"Authorization": paseto
Expand All @@ -751,8 +760,8 @@ function EditableAccountType({selectedBank}:EditableProp){

function onFinish(field:any){
const payload = {
key:'account_type',
value: field.accountType,
// key:'account_type',
accountType: field.accountType,
id: selectedBank.id
}
mutation.mutate(payload)
Expand Down
12 changes: 6 additions & 6 deletions components/Manager/Organizations/EditOrg/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ interface EditableProp{

function onFinish(updatedItem:any){
const payload = {
key:'name',
value: updatedItem.name,
// key:'name',
name: updatedItem.name,
//@ts-ignore
id: selectedOrg.orgId
}
Expand Down Expand Up @@ -342,8 +342,8 @@ interface EditableProp{

function onFinish(field:any){
const payload = {
key:'contact_number',
value: field.contactNumber,
// key:'contact_number',
contactNumber: field.contactNumber,
id: selectedOrg.id
}
console.log(payload)
Expand Down Expand Up @@ -433,8 +433,8 @@ interface EditableProp{

function onFinish(field:any){
const payload = {
key:'zip_code',
value: field.zipCode,
// key:'zip_code',
zipCode: field.zipCode,
id: selectedOrg.id
}
mutation.mutate(payload)
Expand Down
62 changes: 32 additions & 30 deletions components/Manager/Organizations/ManagerOrgsView/ManagerOrgsView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ import { useAuthContext } from '../../../../context/AuthContext';
import dayjs from 'dayjs'
import { ColumnsType, ColumnType, TableProps } from 'antd/lib/table';
import { useOrgContext } from "../../../../context/OrgContext";
import { asyncStore } from "../../../../utils/nftStorage";
import { usePlacesWidget } from "react-google-autocomplete";
import { EditableName, EditableAddress, EditablePhone, EditableZipCode, EditableLogoImage, EditableCoverImage } from "../EditOrg";
import { convertToAmericanFormat } from "../../../../utils/phoneNumberFormatter";
import { EditableText } from "../../../shared/Editables";
Expand Down Expand Up @@ -57,18 +55,18 @@ export default function ManagerOrgsView(){
const [selectedOrg, setSelelectedOrg] = useState<any|NewOrg>({})
const [currentStatus, setCurrentStatus] = useState({id:'1',name: 'Approved'})

async function fetchAllOrgs(){
const res = await axios({
method:'get',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/orgs?pageNumber=${pageNumber}&pageSize=10`,
headers:{
"Authorization": paseto
}
})
// async function fetchAllOrgs(){
// const res = await axios({
// method:'get',
// url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/orgs?pageNumber=${pageNumber}&pageSize=10`,
// headers:{
// "Authorization": paseto
// }
// })

return res.data;
// return res.data;

}
// }

async function fetchOrgs(){
const res = await axios({
Expand All @@ -90,8 +88,8 @@ export default function ManagerOrgsView(){
method:'patch',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org`,
data:{
key:'status',
value: statusNumber, // 0 means de-activated in db
// key:'status',
status: statusNumber, // 0 means de-activated in db
id: orgId
},
headers:{
Expand All @@ -105,8 +103,8 @@ export default function ManagerOrgsView(){
method:'patch',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/users-role`,
data:{
key:'role',
value: '2', // 2 is for admin
// key:'role',
role: '2', // 2 is for admin
targetUserId: userId
},
headers:{
Expand Down Expand Up @@ -189,8 +187,8 @@ export default function ManagerOrgsView(){
const orgs = orgQuery.data && orgQuery.data.data
const totalLength = orgQuery.data && orgQuery.data.dataLength;

const allOrgsQuery = useQuery({queryKey:['all-orgs'], queryFn:fetchAllOrgs, enabled:paseto !== '',staleTime:Infinity})
const allOrgsTotal = allOrgsQuery.data && allOrgsQuery.data.dataLength;
// const allOrgsQuery = useQuery({queryKey:['all-orgs'], queryFn:fetchAllOrgs, enabled:paseto !== '',staleTime:Infinity})
// const allOrgsTotal = allOrgsQuery.data && allOrgsQuery.data.dataLength;



Expand Down Expand Up @@ -431,8 +429,8 @@ export default function ManagerOrgsView(){
method:'patch',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org`,
data:{
key:'status',
value: '1',
// key:'status',
status: '1',
//@ts-ignore
id: record.orgId
},
Expand Down Expand Up @@ -546,9 +544,10 @@ export default function ManagerOrgsView(){
<link rel="icon" href="/favicon.png" />
</Head>

{ allOrgsQuery && allOrgsTotal === 0
{/* { allOrgsQuery && allOrgsTotal === 0
? null
: <div style={{marginBottom:'2rem', marginTop:'2rem', display:'flex', width:'100%', flexDirection:'column',}}>
: */}
<div style={{marginBottom:'2rem', marginTop:'2rem', display:'flex', width:'100%', flexDirection:'column',}}>
<div style={{width:'100%', marginBottom:'1rem', display:'flex', justifyContent:'space-between', alignItems:'center'}}>
<Title style={{margin: '0'}} level={2}>Organizations</Title>
<div>
Expand All @@ -564,11 +563,12 @@ export default function ManagerOrgsView(){
</Radio.Group>

</div>
}
{/* } */}

{ allOrgsQuery && allOrgsTotal === 0
{/* { allOrgsQuery && allOrgsTotal === 0
?<EmptyState/>
:<Table
: */}
<Table
style={{width:'100%'}}
size='middle'
scroll={{ x: 'calc(500px + 50%)'}}
Expand All @@ -583,7 +583,9 @@ export default function ManagerOrgsView(){
total:totalLength,
showTotal:(total) => `Total: ${total} items`,
}}
/>}
/>

{/* } */}
{
isDrawerOpen
?<DetailDrawer isDrawerOpen={isDrawerOpen} closeDrawer={setIsDrawerOpen} selectedOrg={selectedOrg}/>
Expand Down Expand Up @@ -659,8 +661,8 @@ async function reActivateOrgHandler(record:NewOrg){
method:'patch',
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/org`,
data:{
key:'status',
value: '1',
// key:'status',
status: '1',
//@ts-ignore
id: record.orgId
},
Expand All @@ -686,8 +688,8 @@ const deleteDataHandler = async(record:NewOrg)=>{
data: {
//@ts-ignore
id:record.orgId,
key:'status',
value: '0'
// key:'status',
status: '0'
},
headers:{
"Authorization": paseto
Expand Down
4 changes: 2 additions & 2 deletions components/Manager/Platform/serviceItemTypesView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,8 @@ function EditableRole({selectedServiceItemType}:EditableProp){
function onFinish(updatedItem:any){
console.log(updatedItem)
const payload = {
key:'name',
value: String(updatedItem.name),
// key:'name',
name: String(updatedItem.name),
id: selectedServiceItemType.id
}
const updatedRecord = {
Expand Down
4 changes: 2 additions & 2 deletions components/Manager/Users/UsersView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -337,8 +337,8 @@ const deleteDataHandler = async(record:User)=>{
url:`${process.env.NEXT_PUBLIC_NEW_API_URL}/${urlPrefix}/users-role`,
data: {
targetUserId:record.id,
key:'status',
value: "0"
// key:'status',
status: "0"
},
headers:{
"Authorization": paseto
Expand Down
Loading

0 comments on commit 5015baf

Please sign in to comment.