Commit 268d3528 authored by PDuarte's avatar PDuarte

asset project selector

parent 146025c8
......@@ -11,7 +11,7 @@ const navbarReducer = (state = initialState, action) => {
case 'HANDLE_SEARCH_QUERY':
return { ...state, query: action.val }
case 'HANDLE_PROJECT_CURRENT':
return { ...state, projectCurrent: action.val }
return { ...state, projectCurrent: action.val }
case 'GET_BOOKMARKS':
return { ...state, suggestions: action.data, bookmarks: action.bookmarks }
case 'UPDATE_BOOKMARKED':
......
......@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'
// ** Store & Actions
import { addasset } from '../../store/actions'
import { useDispatch } from 'react-redux'
import { useDispatch, useSelector } from 'react-redux'
// ** Custom Components
import Breadcrumbs from '@components/breadcrumbs'
......@@ -21,6 +21,7 @@ import '@styles/react/libs/tables/react-dataTable-component.scss'
const Tables = () => {
const dispatch = useDispatch()
const storeNavbar = useSelector(state => state.navbar)
const onSubmitHandler = (values, uploadFile) => {
dispatch(
addasset({
......@@ -54,9 +55,11 @@ const Tables = () => {
<h4 className="card-title">New {moduleSettings.mainTitleSingle}</h4>
</div>
<div className="card-body">
<ElementCard selectedElement={{
{storeNavbar.projectCurrent === null ? <div>
Select Project
</div> : <ElementCard selectedElement={{
id: '<generate>',
projectid: '2',
projectid: storeNavbar.projectCurrent.value,
title: '',
parentid: null,
parenttype: null,
......@@ -69,6 +72,7 @@ const Tables = () => {
}}
onSubmitHandler={onSubmitHandler}
/>
}
</div>
</div>
......
......@@ -13,6 +13,15 @@ const DataTable = () => {
// ** Store Vars
const dispatch = useDispatch()
const store = useSelector(state => state.assets)
const storeNavbar = useSelector(state => state.navbar)
useEffect(() => {
dispatch(getData_assets({
start: 0,
length: 1000
}))
}, [storeNavbar.projectCurrent])
return (
<DataTableServerSide
......
import { useSelector, useStore, ReactReduxContext } from 'react-redux'
import axios from 'axios'
import {setSaveSatus, setErrorMsg} from '../../../../redux/actions/api'
import moduleSettings from '../../projectassets/module'
import {store} from '@store/storeConfig/store'
// ** Get table Data ///api/datatables/data
const _getData_assets = params => {
const _getData_assets = params => {
return async dispatch => {
await axios.get(`${process.env.REACT_APP_API}${moduleSettings.apiBaseURL}`, {params}
......@@ -21,10 +22,13 @@ const _getData_assets = params => {
})
}
}
export const getData_assets = params => {
const currentProject = store.getState().navbar.projectCurrent
const newparams = {
...params,
idproject: 2
idproject: !currentProject ? '%' : currentProject.value
}
return _getData_assets(newparams)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment