Skip to content

[O2B-1181] Add easy to reach no-anonymous toggle #1451

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
martinboulais merged 2 commits into from
Mar 8, 2024
Merged

[O2B-1181] Add easy to reach no-anonymous toggle #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17c7e39
[O2B-1181] Add easy to reach no-anonymous toggle
martinboulais Mar 8, 2024
6391343
Place properly the toggle
martinboulais Mar 8, 2024
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
3 changes: 3 additions & 0 deletions lib/public/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ export default class Model extends Observable {
this.simulationPasses = new SimulationPassesModel(this);
this.simulationPasses.bubbleTo(this);

/**
* @type {LogsModel}
*/
this.logs = new LogsModel(this);
this.logs.bubbleTo(this);

Expand Down
9 changes: 6 additions & 3 deletions lib/public/components/Filters/LogsFilter/author/AuthorFilterModel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,15 @@ export class AuthorFilterModel extends FilterInputModel {
*
* @returns {void}
*/
applyExcludeAnonymousFilter() {
toggleAnonymousFilter() {
if (this.isAnonymousExcluded()) {
return;
this._raw = this._raw.split(',')
.filter((author) => author.trim() !== '!Anonymous')
.join(',');
} else {
this._raw += super.isEmpty ? '!Anonymous' : ', !Anonymous';
}

this._raw += super.isEmpty ? '!Anonymous' : ', !Anonymous';
this._value = this.valueFromRaw(this._raw);
this.notify();
}
Expand Down
17 changes: 7 additions & 10 deletions lib/public/components/Filters/LogsFilter/author/authorFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import { h } from '/js/src/index.js';
import { iconX } from '/js/src/icons.js';
import { switchInput } from '../../../common/form/switchInput.js';

/**
* Returns a text input field that can be used to filter logs by author
Expand Down Expand Up @@ -40,19 +41,15 @@ const resetAuthorFilterButton = (authorFilterModel) => h(
);

/**
* Returns a button that can be used to exclude anonymous authors
* Returns a toggle that can be used to exclude anonymous authors
*
* @param {AuthorFilterModel} authorFilterModel The author filter model object
* @return {Component} A button component that can be used to exclude anonymous authors
*/
const excludeAnonymousButton = (authorFilterModel) => h(
'input.btn.btn-primary',
{
type: 'button',
value: 'No Anonymous',
disabled: authorFilterModel.isAnonymousExcluded(),
onclick: () => authorFilterModel.applyExcludeAnonymousFilter(),
},
export const excludeAnonymousLogAuthorToggle = (authorFilterModel) => switchInput(
authorFilterModel.isAnonymousExcluded(),
() => authorFilterModel.toggleAnonymousFilter(),
{ labelAfter: 'No Anonymous' },
);

/**
Expand All @@ -64,5 +61,5 @@ const excludeAnonymousButton = (authorFilterModel) => h(
export const authorFilter = ({ authorFilter }) => h('.flex-row.items-center.g3', [
authorFilterTextInput(authorFilter),
resetAuthorFilterButton(authorFilter),
excludeAnonymousButton(authorFilter),
excludeAnonymousLogAuthorToggle(authorFilter),
]);
6 changes: 5 additions & 1 deletion lib/public/views/Logs/Overview/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { estimateDisplayableRowsCount } from '../../../utilities/estimateDisplay
import { paginationComponent } from '../../../components/Pagination/paginationComponent.js';
import { frontLink } from '../../../components/common/navigation/frontLink.js';
import { filtersPanelPopover } from '../../../components/Filters/common/filtersPanelPopover.js';
import { excludeAnonymousLogAuthorToggle } from '../../../components/Filters/LogsFilter/author/authorFilter.js';

const TABLEROW_HEIGHT = 69;
// Estimate of the navbar and pagination elements height total; Needs to be updated in case of changes;
Expand All @@ -36,7 +37,10 @@ const logOverviewScreen = ({ logs: { overviewModel: logsOverviewModel } }) => {

return h('', [
h('.flex-row.justify-between.header-container.pv2', [
filtersPanelPopover(logsOverviewModel, logsActiveColumns),
h('.flex-row.g3', [
filtersPanelPopover(logsOverviewModel, logsActiveColumns),
excludeAnonymousLogAuthorToggle(logsOverviewModel.authorFilter),
]),
actionButtons(),
]),
h('.w-100.flex-column', [
Expand Down