From 5c5e22229f6a399fddb355df23c4af4975cf3384 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Wed, 15 Apr 2020 10:47:38 -0700 Subject: [PATCH] feat: implement custom template description functionality for clubhouse add clubhouse customTemplate db settings add clubhouse tab to settings page create templateParser and templateMessenger classes --- src/html/settings.html | 37 +++++++++++++++++++++ src/images/Clubhouse_FlagSymbol_White.png | Bin 0 -> 11972 bytes src/images/Clubhouse_FlagSymbol_White.svg | 20 +++++++++++ src/scripts/background.js | 5 ++- src/scripts/content/clubhouse.js | 34 +++++++++++++++---- src/scripts/index.d.ts | 10 ++++++ src/scripts/lib/customTemplateMessenger.ts | 32 ++++++++++++++++++ src/scripts/lib/customTemplateParser.ts | 20 +++++++++++ src/scripts/lib/db.js | 4 +++ src/scripts/settings.js | 18 ++++++++++ src/styles/settings.css | 8 ++++- 11 files changed, 180 insertions(+), 8 deletions(-) create mode 100644 src/images/Clubhouse_FlagSymbol_White.png create mode 100644 src/images/Clubhouse_FlagSymbol_White.svg create mode 100644 src/scripts/lib/customTemplateMessenger.ts create mode 100644 src/scripts/lib/customTemplateParser.ts diff --git a/src/html/settings.html b/src/html/settings.html index a8f4f3cf3..bc3db601a 100644 --- a/src/html/settings.html +++ b/src/html/settings.html @@ -38,6 +38,14 @@

Settings

Integrations +
  • + +
    + +
    + Clubhouse +     +
  • @@ -235,6 +243,35 @@

    Reset all settings

    +
    +
    +
    +

    Clubhouse settings

    +
    +
    + + +
    +
    + +
    +
    +
    diff --git a/src/images/Clubhouse_FlagSymbol_White.png b/src/images/Clubhouse_FlagSymbol_White.png new file mode 100644 index 0000000000000000000000000000000000000000..c0271c8722649ec88cf8f05869e4a2cd5e2be36b GIT binary patch literal 11972 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 HCWQVU#bFx( literal 0 HcmV?d00001 diff --git a/src/images/Clubhouse_FlagSymbol_White.svg b/src/images/Clubhouse_FlagSymbol_White.svg new file mode 100644 index 000000000..351875939 --- /dev/null +++ b/src/images/Clubhouse_FlagSymbol_White.svg @@ -0,0 +1,20 @@ + + + + + + diff --git a/src/scripts/background.js b/src/scripts/background.js index b7bea7ef8..b13af3f4d 100644 --- a/src/scripts/background.js +++ b/src/scripts/background.js @@ -120,7 +120,6 @@ window.TogglButton = {
    ` + - `
    @@ -2063,6 +2062,10 @@ window.TogglButton = { resolve({ currentEntry: TogglButton.$curEntry }); + } else if (request.type === 'getClubhouseCustomTemplateSettings') { + const useCustomTemplate = await db.get('clubhouseUseCustomTemplate'); + const customTemplate = await db.get('clubhouseCustomTemplate'); + return resolve({ useCustomTemplate, customTemplate }); } else if (request.type === 'error') { // Handling integration errors error = new Error(); diff --git a/src/scripts/content/clubhouse.js b/src/scripts/content/clubhouse.js index d05a58e56..87ed79e5c 100644 --- a/src/scripts/content/clubhouse.js +++ b/src/scripts/content/clubhouse.js @@ -1,24 +1,46 @@ 'use strict'; +import CustomTemplateMessenger from '../lib/customTemplateMessenger'; +import CustomTemplateParser from '../lib/customTemplateParser'; -togglbutton.render('.story-state:not(.toggl)', { observe: true }, function ( +togglbutton.render('.story-state:not(.toggl)', { observe: true }, async function ( elem ) { const wrap = createTag('div'); const element = elem; elem = elem.parentNode.parentNode.parentNode; - const getDescription = function () { - return $('h2.story-name', elem).textContent; + const getEpicName = function () { + return $('#story-dialog-epic-dropdown .value', elem).textContent; }; - const getProject = function () { + const getProjectName = function () { return $('.story-project .value', elem).textContent; }; + const getStoryId = function () { + return $('.story-dialog .right-column .story-id input', elem).value; + }; + + const getStoryTitle = function () { + return $('h2.story-name', elem).textContent; + }; + + // Matches field names to appropriate get function + const customTemplateMap = { + epicName: getEpicName, + projectName: getProjectName, + storyId: getStoryId, + storyTitle: getStoryTitle + }; + + const templateSettings = new CustomTemplateMessenger('getClubhouseCustomTemplateSettings'); + await templateSettings.fetchSettings(); + const templateParser = new CustomTemplateParser(customTemplateMap, templateSettings.customTemplate); + const link = togglbutton.createTimerLink({ className: 'clubhouse', - description: getDescription, - projectName: getProject + description: templateSettings.useCustomTemplate ? templateParser.parse() : getStoryTitle, + projectName: getProjectName }); wrap.className = 'attribute editable-attribute'; diff --git a/src/scripts/index.d.ts b/src/scripts/index.d.ts index fed542c34..acfa9a1b1 100644 --- a/src/scripts/index.d.ts +++ b/src/scripts/index.d.ts @@ -217,3 +217,13 @@ interface FailureResponse { } type ButtonResponse = SuccessResponse | FailureResponse; + +interface CustomTemplateMessage { + customTemplate: string; + useCustomTemplate: boolean; + +} + +interface CustomTemplateParserMap { + [key: string]: string|((...args: any[]) => string); +} \ No newline at end of file diff --git a/src/scripts/lib/customTemplateMessenger.ts b/src/scripts/lib/customTemplateMessenger.ts new file mode 100644 index 000000000..6334d94e5 --- /dev/null +++ b/src/scripts/lib/customTemplateMessenger.ts @@ -0,0 +1,32 @@ +const browser = require('webextension-polyfill'); + +class CustomTemplateMessenger { + customTemplate = ""; + customTemplateMessageName = ""; + useCustomTemplate = false; + + constructor(customTemplateMessageName: string){ + this.customTemplateMessageName = customTemplateMessageName; + } + + async fetchSettings () { + await browser.runtime.sendMessage({ + type: this.customTemplateMessageName + }).then( + (res) => this.handleResponse(res), + (err) => this.handleError(err) + ); + } + + handleError (error: any) { + console.error('handleError: ', error); + } + + handleResponse = ({ useCustomTemplate, customTemplate }: CustomTemplateMessage):void => { + this.useCustomTemplate = useCustomTemplate; + this.customTemplate = customTemplate; + } + +} + +export default CustomTemplateMessenger; diff --git a/src/scripts/lib/customTemplateParser.ts b/src/scripts/lib/customTemplateParser.ts new file mode 100644 index 000000000..9c073f655 --- /dev/null +++ b/src/scripts/lib/customTemplateParser.ts @@ -0,0 +1,20 @@ +class CustomTemplateParser { + templateMap = {}; + templateStr = ""; + regexParser: RegExp; + constructor(templateMap: CustomTemplateParserMap, templateStr: string){ + this.templateMap = templateMap; + this.templateStr = templateStr; + this.regexParser = new RegExp(/{{\s*(.*?)\s*}}/); + } + parse():string { + let strMatch = this.templateStr.match(this.regexParser); + while (strMatch) { + this.templateStr = this.templateStr.replace(strMatch[0], this.templateMap[strMatch[1]]()); + strMatch = this.templateStr.match(this.regexParser); + } + return this.templateStr; + }; +} + +export default CustomTemplateParser; diff --git a/src/scripts/lib/db.js b/src/scripts/lib/db.js index d3ce951a8..acfd2ec32 100644 --- a/src/scripts/lib/db.js +++ b/src/scripts/lib/db.js @@ -31,6 +31,10 @@ const DEFAULT_SETTINGS = { rememberProjectPer: 'false', enableAutoTagging: false, + // Clubhouse Settings + clubhouseUseCustomTemplate: false, + clubhouseCustomTemplate: '[{{ epicName }}] ({{ storyId }}) - {{ storyTitle }}', + sendErrorReports: true, sendUsageStatistics: true }; diff --git a/src/scripts/settings.js b/src/scripts/settings.js index 6edd7fb06..edb5fc72e 100644 --- a/src/scripts/settings.js +++ b/src/scripts/settings.js @@ -55,6 +55,9 @@ const Settings = { $pomodoroTickerVolume: null, $pomodoroTickerVolumeLabel: null, + $clubhouseUseCustomTemplate: null, + $clubhouseCustomTemplate: null, + $sendUsageStatistics: null, $sendErrorReports: null, $enableAutoTagging: null, @@ -90,6 +93,10 @@ const Settings = { const stopAtDayEnd = await db.get('stopAtDayEnd'); const dayEndTime = await db.get('dayEndTime'); + Settings.$clubhouseUseCustomTemplate.checked = await (db.get('clubhouseUseCustomTemplate')); + Settings.$clubhouseCustomTemplate.disabled = !Settings.$clubhouseUseCustomTemplate.checked; + Settings.$clubhouseCustomTemplate.value = await db.get('clubhouseCustomTemplate'); + Settings.$loginInfo.textContent = TogglButton.$user && TogglButton.$user.email || ''; document.querySelector('.expand').addEventListener('click', e => { @@ -678,6 +685,9 @@ document.addEventListener('DOMContentLoaded', async function (e) { Settings.$pomodoroTickerVolume = document.querySelector('#ticker-sound-volume'); Settings.$pomodoroTickerVolumeLabel = document.querySelector('#ticker-volume-label'); + Settings.$clubhouseUseCustomTemplate = document.querySelector('#clubhouse-use-custom-template'); + Settings.$clubhouseCustomTemplate = document.querySelector('#clubhouse-custom-template'); + // Change active tab if present in search param const activeTabParam = getUrlParam(document.location, 'tab'); changeActiveTab(activeTabParam || DEFAULT_TAB); @@ -829,6 +839,14 @@ document.addEventListener('DOMContentLoaded', async function (e) { Settings.$pomodoroTickerVolumeLabel.textContent = e.target.value + '%'; }); + Settings.$clubhouseUseCustomTemplate.addEventListener('input', async function (e) { + await db.set('clubhouseUseCustomTemplate', e.target.checked); + Settings.$clubhouseCustomTemplate.disabled = !e.target.checked; + }); + Settings.$clubhouseCustomTemplate.addEventListener('input', async function (e) { + await db.set('clubhouseCustomTemplate', e.target.value); + }); + const tickerSoundTest = document.querySelector('#ticker-sound-test'); const tickerSound = new Audio(); let isPlaying = false; diff --git a/src/styles/settings.css b/src/styles/settings.css index d63a8b358..893fd7dba 100644 --- a/src/styles/settings.css +++ b/src/styles/settings.css @@ -46,7 +46,7 @@ body { color: var(--text-color); font-family: Roboto, Helvetica, sans-serif; -webkit-font-smoothing: antialiased; -} +} body { height: 100vh; @@ -674,3 +674,9 @@ section .field--showDetails .subsettings-details { body[data-show-review-banner="true"] #review-prompt { transform: translateY(0); } + +.custom-template-input:disabled { + background-color: var(--border-color); + color: var(--light-text); + cursor: not-allowed; +}