CFE-6 Merge branch 'develop' into 'bugfix/CFE-6_fix_toas_containers'
This commit is contained in:
@@ -29,7 +29,7 @@ function DataTable(props) {
|
||||
});
|
||||
|
||||
const [updateTime, setUpdateTime] = useState(
|
||||
moment().format("HH:mm | jYYYY/jM/jD")
|
||||
moment().format("HH:mm | jYYYY/jMM/jDD")
|
||||
);
|
||||
|
||||
const tableLocalization = useMemo(
|
||||
@@ -84,7 +84,7 @@ function DataTable(props) {
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
setUpdateTime(moment().format("HH:mm | jYYYY/jM/jD"));
|
||||
setUpdateTime(moment().format("HH:mm | jYYYY/jMM/jDD"));
|
||||
}, [isValidating, languageApp]);
|
||||
|
||||
return (
|
||||
|
||||
@@ -29,21 +29,16 @@ export const GET_USER = BASE_URL + "/api/profile/info";
|
||||
//user data
|
||||
|
||||
//sidebar notification
|
||||
export const GET_SIDEBAR_NOTIFICATION = BASE_URL + "/dashboard/notification"
|
||||
export const GET_SIDEBAR_NOTIFICATION = BASE_URL + "/dashboard/notification";
|
||||
//sidebar notification
|
||||
|
||||
// role management
|
||||
export const GET_ROLES =
|
||||
BASE_URL + "/api/roles"
|
||||
export const ADD_ROLE =
|
||||
BASE_URL + "/api/roles"
|
||||
export const UPDATE_ROLE =
|
||||
BASE_URL + "/api/roles"
|
||||
export const DELETE_ROLE =
|
||||
BASE_URL + "/api/roles"
|
||||
export const GET_ROLES = BASE_URL + "/api/roles";
|
||||
export const ADD_ROLE = BASE_URL + "/api/roles";
|
||||
export const UPDATE_ROLE = BASE_URL + "/api/roles";
|
||||
export const DELETE_ROLE = BASE_URL + "/api/roles";
|
||||
|
||||
export const GET_PERMISSIONS_LIST =
|
||||
BASE_URL + "/api/permissions/list"
|
||||
export const GET_PERMISSIONS_LIST = BASE_URL + "/api/permissions/list";
|
||||
//role management
|
||||
|
||||
//expert management
|
||||
@@ -51,4 +46,9 @@ export const GET_EXPERTS = BASE_URL + "/api/users";
|
||||
export const ADD_EXPERT = BASE_URL + "/api/users";
|
||||
export const UPDATE_EXPERT = BASE_URL + "/api/users";
|
||||
export const DELETE_EXPERT = BASE_URL + "/api/users";
|
||||
//expert management
|
||||
//expert management
|
||||
|
||||
//call action history
|
||||
export const GET_CATEGORY = BASE_URL + "/api/categories";
|
||||
export const CALL_ACTION = BASE_URL + "/api/calls";
|
||||
//call action history
|
||||
|
||||
Reference in New Issue
Block a user