Skip to content

Commit a9fc45f

Browse files
committed
Merge branch 'develop'
2 parents aa3c7c1 + 858d738 commit a9fc45f

File tree

1 file changed

+31
-35
lines changed

1 file changed

+31
-35
lines changed

frontend/src/components/filters/DataFilters.js

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -62,41 +62,37 @@ const DataFilters = ({ loading, showAdm = true }) => {
6262
<AdvancedFiltersButton />
6363
</Space>
6464
</Col>
65-
{["Super Admin", "County Admin", "Data Entry Supervisor"].includes(
66-
authUser?.role?.value
67-
) && (
68-
<Col>
69-
<Space>
70-
{pathname === "/control-center/data/manage" && (
71-
<Button
72-
shape="round"
73-
onClick={exportGenerate}
74-
loading={exporting}
75-
icon={<DownloadOutlined />}
76-
>
77-
Download Data
78-
</Button>
79-
)}
80-
<Link to="/control-center/data/upload">
81-
<Button shape="round" icon={<UploadOutlined />}>
82-
Bulk Upload
83-
</Button>
84-
</Link>
85-
<Link to={`/control-center/form/${selectedForm}`}>
86-
<Button
87-
shape="round"
88-
icon={<PlusOutlined />}
89-
type="primary"
90-
disabled={
91-
!isUserHasForms && authUser?.role?.value !== "Super Admin"
92-
}
93-
>
94-
Add New
95-
</Button>
96-
</Link>
97-
</Space>
98-
</Col>
99-
)}
65+
<Col>
66+
<Space>
67+
{pathname === "/control-center/data/manage" && (
68+
<Button
69+
shape="round"
70+
onClick={exportGenerate}
71+
loading={exporting}
72+
icon={<DownloadOutlined />}
73+
>
74+
Download Data
75+
</Button>
76+
)}
77+
<Link to="/control-center/data/upload">
78+
<Button shape="round" icon={<UploadOutlined />}>
79+
Bulk Upload
80+
</Button>
81+
</Link>
82+
<Link to={`/control-center/form/${selectedForm}`}>
83+
<Button
84+
shape="round"
85+
icon={<PlusOutlined />}
86+
type="primary"
87+
disabled={
88+
!isUserHasForms && authUser?.role?.value !== "Super Admin"
89+
}
90+
>
91+
Add New
92+
</Button>
93+
</Link>
94+
</Space>
95+
</Col>
10096
</Row>
10197
<Row>
10298
<Col>

0 commit comments

Comments
 (0)