Skip to content

CippTable - Graph filter rewrite #1761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2023
Merged

CippTable - Graph filter rewrite #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 78 additions & 95 deletions src/components/tables/CippTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useRef } from 'react'
import React, { useRef, useMemo, useState } from 'react'
import { useSelector } from 'react-redux'
import { ExportCsvButton, ExportPDFButton } from 'src/components/buttons'
import {
Expand All @@ -25,16 +25,9 @@ import { cellGenericFormatter } from './CellGenericFormat'
import { ModalService } from '../utilities'
import { useLazyGenericGetRequestQuery, useLazyGenericPostRequestQuery } from 'src/store/api/app'
import { ConfirmModal } from '../utilities/SharedModal'
import { useState } from 'react'
import { debounce } from 'lodash'

const FilterComponent = ({
filterText,
onFilter,
onClear,
filterlist,
onFilterPreset,
onFilterGraph,
}) => (
const FilterComponent = ({ filterText, onFilter, onClear, filterlist, onFilterPreset }) => (
<>
<CInputGroup>
<CDropdown variant="input-group">
Expand All @@ -50,26 +43,17 @@ const FilterComponent = ({
<CDropdownItem
onClick={() => {
onFilterPreset('')
onFilterGraph('')
}}
>
Clear Filter
</CDropdownItem>
{filterlist &&
filterlist.map((item, idx) => {
if (item.hasOwnProperty('graphFilter') && item.graphFilter == true) {
return (
<CDropdownItem key={idx} onClick={() => onFilterGraph(item.filter)}>
{item.filterName}
</CDropdownItem>
)
} else {
return (
<CDropdownItem key={idx} onClick={() => onFilterPreset(item.filter)}>
{item.filterName}
</CDropdownItem>
)
}
return (
<CDropdownItem key={idx} onClick={() => onFilterPreset(item.filter)}>
{item.filterName}
</CDropdownItem>
)
})}
</CDropdownMenu>
</CDropdown>
Expand All @@ -93,7 +77,6 @@ FilterComponent.propTypes = {
onClear: PropTypes.func,
filterlist: PropTypes.arrayOf(PropTypes.object),
onFilterPreset: PropTypes.func,
onFilterGraph: PropTypes.func,
}

const customSort = (rows, selector, direction) => {
Expand Down Expand Up @@ -204,8 +187,23 @@ export default function CippTable({
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
}

const setGraphFilter = (e) => {
if (graphFilterFunction) {
graphFilterFunction(e)
console.log(e)
}
}

const debounceSetGraphFilter = useMemo(() => {
return debounce(setGraphFilter, 1000)
}, [])

const filterData = (data, filterText) => {
if (filterText.startsWith('Complex:')) {
if (filterText.startsWith('Graph:')) {
var query = filterText.slice(6).trim()
debounceSetGraphFilter(query)
return data
} else if (filterText.startsWith('Complex:')) {
const conditions = filterText.slice(9).split(';')

return conditions.reduce((filteredData, condition) => {
Expand Down Expand Up @@ -262,12 +260,6 @@ export default function CippTable({
setFilterText(e.target.value)
}

const setGraphFilter = (e) => {
if (graphFilterFunction) {
graphFilterFunction(e)
}
}

useEffect(() => {
if (columns !== updatedColumns) {
setUpdatedColumns(columns)
Expand Down Expand Up @@ -592,11 +584,6 @@ export default function CippTable({
onFilter={(e) => setFilterText(e.target.value)}
onFilterPreset={(e) => {
setFilterText(e)
setGraphFilter('')
}}
onFilterGraph={(e) => {
setFilterText('')
setGraphFilter(e)
}}
onClear={handleClear}
filterText={filterText}
Expand All @@ -620,65 +607,61 @@ export default function CippTable({
const tablePageSize = useSelector((state) => state.app.tablePageSize)
return (
<div className="ms-n3 me-n3 cipp-tablewrapper">
{!isFetching && error && <span>Error loading data</span>}
{!error && (
<div>
{(columns.length === updatedColumns.length || !dynamicColumns) && (
<>
{(massResults.length >= 1 || loopRunning) && (
<CCallout color="info">
{massResults.map((message, idx) => {
const results = message.data?.Results
const displayResults = Array.isArray(results) ? results.join(', ') : results
{!isFetching && error && <CCallout color="info">Error loading data</CCallout>}
<div>
{(columns.length === updatedColumns.length || !dynamicColumns) && (
<>
{(massResults.length >= 1 || loopRunning) && (
<CCallout color="info">
{massResults.map((message, idx) => {
const results = message.data?.Results
const displayResults = Array.isArray(results) ? results.join(', ') : results

return <li key={`message-${idx}`}>{displayResults}</li>
})}
{loopRunning && (
<li>
<CSpinner size="sm" />
</li>
)}
</CCallout>
)}
<DataTable
customStyles={customStyles}
className="cipp-table"
theme={theme}
subHeader={subheader}
selectableRows={selectableRows}
onSelectedRowsChange={
onSelectedRowsChange ? onSelectedRowsChange : handleSelectedChange
}
subHeaderComponent={subHeaderComponentMemo}
subHeaderAlign="left"
paginationResetDefaultPage={resetPaginationToggle}
//actions={actionsMemo}
pagination={pagination}
responsive={responsive}
dense={dense}
striped={striped}
columns={columns}
data={filteredItems}
expandableRows={expandableRows}
expandableRowsComponent={expandableRowsComponent}
highlightOnHover={highlightOnHover}
expandOnRowClicked={expandOnRowClicked}
defaultSortAsc
defaultSortFieldId={1}
sortFunction={customSort}
paginationPerPage={tablePageSize}
progressPending={isFetching}
progressComponent={<CSpinner color="info" component="div" />}
paginationRowsPerPageOptions={[25, 50, 100, 200, 500]}
{...rest}
/>
{selectedRows.length >= 1 && (
<CCallout>Selected {selectedRows.length} items</CCallout>
)}
</>
)}
</div>
)}
return <li key={`message-${idx}`}>{displayResults}</li>
})}
{loopRunning && (
<li>
<CSpinner size="sm" />
</li>
)}
</CCallout>
)}
<DataTable
customStyles={customStyles}
className="cipp-table"
theme={theme}
subHeader={subheader}
selectableRows={selectableRows}
onSelectedRowsChange={
onSelectedRowsChange ? onSelectedRowsChange : handleSelectedChange
}
subHeaderComponent={subHeaderComponentMemo}
subHeaderAlign="left"
paginationResetDefaultPage={resetPaginationToggle}
//actions={actionsMemo}
pagination={pagination}
responsive={responsive}
dense={dense}
striped={striped}
columns={columns}
data={filteredItems}
expandableRows={expandableRows}
expandableRowsComponent={expandableRowsComponent}
highlightOnHover={highlightOnHover}
expandOnRowClicked={expandOnRowClicked}
defaultSortAsc
defaultSortFieldId={1}
sortFunction={customSort}
paginationPerPage={tablePageSize}
progressPending={isFetching}
progressComponent={<CSpinner color="info" component="div" />}
paginationRowsPerPageOptions={[25, 50, 100, 200, 500]}
{...rest}
/>
{selectedRows.length >= 1 && <CCallout>Selected {selectedRows.length} items</CCallout>}
</>
)}
</div>
</div>
)
}
Expand Down
6 changes: 2 additions & 4 deletions src/views/identity/administration/Users.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,13 +356,11 @@ const Users = (row) => {
{ filterName: 'Users without a license', filter: '"assignedLicenses":[]' },
{
filterName: 'Users with a license (Graph)',
filter: 'assignedLicenses/$count ne 0',
graphFilter: true,
filter: 'Graph: assignedLicenses/$count ne 0',
},
{
filterName: 'Users with a license & Enabled (Graph)',
filter: 'assignedLicenses/$count ne 0 and accountEnabled eq true',
graphFilter: true,
filter: 'Graph: assignedLicenses/$count ne 0 and accountEnabled eq true',
},
],
columns,
Expand Down
8 changes: 3 additions & 5 deletions src/views/tenant/administration/ListEnterpriseApps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ const EnterpriseApplications = () => {
selector: (row) => row.homepage,
sortable: true,
exportSelector: 'homepage',
cell: cellDateFormatter({ format: 'short' }),
},
]
return (
Expand All @@ -88,13 +87,12 @@ const EnterpriseApplications = () => {
filterlist: [
{
filterName: 'All Enterprise Apps',
filter: "tags/any(t:t eq 'WindowsAzureActiveDirectoryIntegratedApp')",
graphFilter: true,
filter: "Graph: tags/any(t:t eq 'WindowsAzureActiveDirectoryIntegratedApp')",
},
{
filterName: 'Enterprise Apps (SAML)',
filter: "tags/any(t:t eq 'WindowsAzureActiveDirectoryGalleryApplicationPrimaryV1')",
graphFilter: true,
filter:
"Graph: tags/any(t:t eq 'WindowsAzureActiveDirectoryGalleryApplicationPrimaryV1')",
},
],
tableProps: {
Expand Down
2 changes: 1 addition & 1 deletion src/views/tenant/administration/ListGDAPRelationships.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ const Actions = (row, rowIndex, formatExtraData) => {
})
const tenant = useSelector((state) => state.app.currentTenant)

row?.accessDetails.unifiedRoles.map((role) => {
row?.accessDetails?.unifiedRoles?.map((role) => {
for (var x = 0; x < GDAPRoles.length; x++) {
if (GDAPRoles[x].ObjectId == role.roleDefinitionId) {
extendedInfo.push({
Expand Down