Cadoles/daddy
Cadoles
/
daddy
17
0
Fork 0
Code Issues 16 Pull Requests Releases Wiki Activity

Merge branch 'develop' into dist/ubuntu/bionic/develop

This commit is contained in:
wpetit 2020-10-05 17:25:28 +02:00
parent 1a0456ee84 7a6eedab9d
commit 3a102bde60
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/components/DashboardPage/Dashboard.tsx
View File

@ -26,7 +26,7 @@ export function Dashboard() {
</div> </div>
<div className="column is-4"> <div className="column is-4">
<div className="panel is-info"> <div className="panel is-info">
<p className="level panel-heading mb-0"> <div className="level panel-heading mb-0">
<div className="level-left"> <div className="level-left">
<div className="level-item"> <div className="level-item">
Ces 7 derniers jours Ces 7 derniers jours
@ -37,7 +37,7 @@ export function Dashboard() {
<i className="icon fa fa-sliders-h"></i> <i className="icon fa fa-sliders-h"></i>
</button> </button>
</div> </div>
</p> </div>
<div className="panel-block"> <div className="panel-block">
<Timeline events={events} /> <Timeline events={events} />
</div> </div>

4
client/src/components/DecisionSupportFilePage/TimelinePanel.tsx
View File

@ -19,7 +19,7 @@ export const TimelinePanel: FunctionComponent<TimelinePanelProps> = ({ dsf }) =>
return ( return (
<div className="panel"> <div className="panel">
<p className="level panel-heading mb-0"> <div className="level panel-heading mb-0">
<div className="level-left"> <div className="level-left">
<div className="level-item"> <div className="level-item">
Suivi des opérations Suivi des opérations
@ -27,7 +27,7 @@ export const TimelinePanel: FunctionComponent<TimelinePanelProps> = ({ dsf }) =>
</div> </div>
<div className="level-right"> <div className="level-right">
</div> </div>
</p> </div>
<div className="panel-block"> <div className="panel-block">
<Timeline events={events} /> <Timeline events={events} />
</div> </div>

4
client/src/components/WorkgroupPage/TimelinePanel.tsx
View File

@ -20,7 +20,7 @@ export const TimelinePanel: FunctionComponent<TimelinePanelProps> = ({ workgroup
return ( return (
<div className="panel"> <div className="panel">
<p className="level panel-heading mb-0"> <div className="level panel-heading mb-0">
<div className="level-left"> <div className="level-left">
<div className="level-item"> <div className="level-item">
Suivi des opérations Suivi des opérations
@ -28,7 +28,7 @@ export const TimelinePanel: FunctionComponent<TimelinePanelProps> = ({ workgroup
</div> </div>
<div className="level-right"> <div className="level-right">
</div> </div>
</p> </div>
<div className="panel-block"> <div className="panel-block">
<Timeline events={events} /> <Timeline events={events} />
</div> </div>

6
client/src/gql/queries/authorization.tsx
View File

@ -8,10 +8,16 @@ export const QUERY_IS_AUTHORIZED = gql`
`; `;
export function useIsAuthorizedQuery<A = any, R = Record<string, any>>(options: QueryHookOptions<A, R> = {}) { export function useIsAuthorizedQuery<A = any, R = Record<string, any>>(options: QueryHookOptions<A, R> = {}) {
options = Object.assign({
fetchPolicy: 'cache-and-network'
}, options);
return useQuery(QUERY_IS_AUTHORIZED, options); return useQuery(QUERY_IS_AUTHORIZED, options);
} }
export function useIsAuthorized<A = any, R = Record<string, any>>(options: QueryHookOptions<A, R> = {}, defaultValue = false) { export function useIsAuthorized<A = any, R = Record<string, any>>(options: QueryHookOptions<A, R> = {}, defaultValue = false) {
options = Object.assign({
fetchPolicy: 'cache-and-network'
}, options);
const { data, loading, error } = useGraphQLData<boolean>( const { data, loading, error } = useGraphQLData<boolean>(
QUERY_IS_AUTHORIZED, 'isAuthorized', defaultValue, options QUERY_IS_AUTHORIZED, 'isAuthorized', defaultValue, options
); );