Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
mbarrramsey committed Oct 29, 2024
1 parent 9595855 commit 1898e27
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {opVersionRefOpName} from '../wfReactInterface/utilities';
import {CallsTable} from './CallsTable';
import {WFHighLevelCallFilter} from './callsTableFilter';
import {useCurrentFilterIsEvaluationsFilter} from './evaluationsFilter';
import {Tailwind} from '../../../../../Tailwind';

const HeaderExtras = () => {
const {renderExtras} = React.useContext(WeaveHeaderExtrasContext);
Expand Down Expand Up @@ -81,37 +80,30 @@ export const CallsPage: FC<{
{
label: 'All',
content: (
<>
{/* <Tailwind style={{width: '100%', overflow: 'visible'}}> */}
{/* <div className="w-full rounded-lg border border-moon-250 bg-red-500">
hello
</div> */}
{/* </Tailwind> */}
<CallsTable
{...props}
// CPR (Tim): Applying "hide controls" when the filter is frozen is pretty crude.
// We will likely need finer-grained control over the filter enablement states
// rather than just a boolean flag. Note: "frozen === hideControls" at the moment.
// In fact, it probably should be used to determine if the filter should be applied
// to the frozenFilter prop. Furthermore, "frozen" is only used when showing the
// evaluations table. So, in this case, I think we should really just remove the
// `frozen` property completely and have a top-level evaluations tab that hides controls.
hideControls={filter.frozen && !isEvaluationTable}
hideOpSelector={isEvaluationTable}
initialFilter={filter}
onFilterUpdate={setFilter}
columnVisibilityModel={props.columnVisibilityModel}
setColumnVisibilityModel={props.setColumnVisibilityModel}
pinModel={props.pinModel}
setPinModel={props.setPinModel}
filterModel={props.filterModel}
setFilterModel={props.setFilterModel}
sortModel={props.sortModel}
setSortModel={props.setSortModel}
paginationModel={props.paginationModel}
setPaginationModel={props.setPaginationModel}
/>
</>
<CallsTable
{...props}
// CPR (Tim): Applying "hide controls" when the filter is frozen is pretty crude.
// We will likely need finer-grained control over the filter enablement states
// rather than just a boolean flag. Note: "frozen === hideControls" at the moment.
// In fact, it probably should be used to determine if the filter should be applied
// to the frozenFilter prop. Furthermore, "frozen" is only used when showing the
// evaluations table. So, in this case, I think we should really just remove the
// `frozen` property completely and have a top-level evaluations tab that hides controls.
hideControls={filter.frozen && !isEvaluationTable}
hideOpSelector={isEvaluationTable}
initialFilter={filter}
onFilterUpdate={setFilter}
columnVisibilityModel={props.columnVisibilityModel}
setColumnVisibilityModel={props.setColumnVisibilityModel}
pinModel={props.pinModel}
setPinModel={props.setPinModel}
filterModel={props.filterModel}
setFilterModel={props.setFilterModel}
sortModel={props.sortModel}
setSortModel={props.setSortModel}
paginationModel={props.paginationModel}
setPaginationModel={props.setPaginationModel}
/>
),
},
]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -850,15 +850,12 @@ export const CallsTable: FC<{
)}
</TailwindContents>
}>
<div className="relative overflow-visible">
{/* Add this wrapper */}
<CallsCharts
entity={entity}
project={project}
filter={filter}
filterModelProp={filterModelResolved}
/>
</div>
<CallsCharts
entity={entity}
project={project}
filter={filter}
filterModelProp={filterModelResolved}
/>
<StyledDataGrid
// Start Column Menu
// ColumnMenu is needed to support pinning and column visibility
Expand Down

0 comments on commit 1898e27

Please sign in to comment.