Skip to content
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.

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

fix: #3104 hide help & closed accounts features #3110

Merged
merged 3 commits into from
May 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import * as React from 'react';
import { l10n, getToolkitStorageKey } from 'toolkit/extension/utils/toolkit';
import { serviceLookup } from 'toolkit/extension/utils/ember';

interface Props {
toggleHiddenState: (state: boolean) => void;
}

export const HideClosedButton = ({ toggleHiddenState }: Props) => {
const isHidden = getToolkitStorageKey('hide-closed', true);
const label = isHidden ? l10n('toolkit.show', 'Show') : l10n('app.hide', 'Hide');

const toggleHidden = () => {
toggleHiddenState(!isHidden);
serviceLookup<YNABModalService>('modal')?.closeModal?.();
};

return (
<li onClick={toggleHidden} id="tk-hide-closed-accounts">
<button>
<i className="flaticon stroke no" />
{` ${label}`} Closed Accounts
</button>
</li>
);
};
72 changes: 0 additions & 72 deletions src/extension/features/general/hide-closed-accounts/index.jsx

This file was deleted.

56 changes: 56 additions & 0 deletions src/extension/features/general/hide-closed-accounts/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import * as React from 'react';
import { componentAppend } from 'toolkit/extension/utils/react';
import { Feature } from 'toolkit/extension/features/feature';
import { getToolkitStorageKey, setToolkitStorageKey } from 'toolkit/extension/utils/toolkit';
import { HideClosedButton } from './HideClosedButton';
import { serviceLookup } from 'toolkit/extension/utils/ember';

export class HideClosedAccounts extends Feature {
injectCSS() {
return require('./index.css');
}

shouldInvoke() {
return (
$('#tk-hide-closed-accounts').length === 0 &&
!!serviceLookup<YNABModalService>('modal')?.isModalOpen &&
!!document.querySelector('.ynab-new-settings-menu')
);
}

invoke() {
const initialState = getToolkitStorageKey('hide-closed', true);
this.setHiddenState(initialState);
const modalElement = document.querySelector('.ynab-new-settings-menu');
if (modalElement) this.insertHideClosed(modalElement);
}

destroy() {
$('#tk-hide-closed-accounts').remove();
$('body').removeClass('tk-hide-closed');
}

observe(nodes: Set<string>) {
if (!this.shouldInvoke()) return;

if (nodes.has('modal-overlay active ynab-u ynab-new-settings-menu')) {
this.invoke();
}
}

insertHideClosed(element: Element) {
componentAppend(
<HideClosedButton toggleHiddenState={this.setHiddenState} />,
element.getElementsByClassName('modal-list')[0]
);
}

setHiddenState = (state: boolean) => {
setToolkitStorageKey('hide-closed', state);
if (state) {
$('body').addClass('tk-hide-closed');
} else {
$('body').removeClass('tk-hide-closed');
}
};
}
26 changes: 26 additions & 0 deletions src/extension/features/general/hide-help/HideHelpButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import * as React from 'react';
import { serviceLookup } from 'toolkit/extension/utils/ember';
import { l10n, getToolkitStorageKey } from 'toolkit/extension/utils/toolkit';

interface Props {
toggleHiddenState: (state: boolean) => void;
}

export const HideHelpButton = ({ toggleHiddenState }: Props) => {
const isHidden = getToolkitStorageKey('hide-help', true);
const label = isHidden ? l10n('toolkit.show', 'Show') : l10n('app.hide', 'Hide');

const toggleHidden = () => {
toggleHiddenState(!isHidden);
serviceLookup<YNABModalService>('modal')?.closeModal?.();
};

return (
<li onClick={toggleHidden} id="tk-hide-help">
<button>
<i className="flaticon stroke help-2" />
{` ${label}`} Help Button
</button>
</li>
);
};
72 changes: 0 additions & 72 deletions src/extension/features/general/hide-help/index.jsx

This file was deleted.

60 changes: 60 additions & 0 deletions src/extension/features/general/hide-help/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
import * as React from 'react';
import { componentAppend } from 'toolkit/extension/utils/react';
import { Feature } from 'toolkit/extension/features/feature';
import { getToolkitStorageKey, setToolkitStorageKey } from 'toolkit/extension/utils/toolkit';
import { HideHelpButton } from './HideHelpButton';
import { serviceLookup } from 'toolkit/extension/utils/ember';

export class HideHelp extends Feature {
injectCSS() {
return require('./index.css');
}

shouldInvoke() {
return (
$('#tk-hide-help').length === 0 &&
!!serviceLookup<YNABModalService>('modal')?.isModalOpen &&
!!document.querySelector('.ynab-new-settings-menu')
);
}

insertHideHelp(element: Element) {
if ($('#tk-hide-help', element).length) {
return;
}

componentAppend(
<HideHelpButton toggleHiddenState={this.setHiddenState} />,
element.getElementsByClassName('modal-list')[0]
);
}

invoke() {
const initialState = getToolkitStorageKey('hide-help', true);
this.setHiddenState(initialState);
const modalElement = document.querySelector('.ynab-new-settings-menu');
if (modalElement) this.insertHideHelp(modalElement);
}

destroy() {
$('#tk-hide-help').remove();
$('body').removeClass('toolkit-hide-help');
}

observe(nodes: Set<string>) {
if (!this.shouldInvoke()) return;

if (nodes.has('modal-overlay active ynab-u ynab-new-settings-menu')) {
this.invoke();
}
}

setHiddenState = (state: boolean) => {
setToolkitStorageKey('hide-help', state);
if (state) {
$('body').addClass('toolkit-hide-help');
} else {
$('body').removeClass('toolkit-hide-help');
}
};
}
4 changes: 4 additions & 0 deletions src/types/ynab/services/YNABModalService.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
interface YNABModalService {
isModalOpen?: boolean;
closeModal?: (e?: unknown) => void;
}