From f8795efff827330e620c05517d182e278cb6cf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaros=C5=82aw=20Sadzi=C5=84ski?= Date: Tue, 3 Jan 2023 17:45:14 +0100 Subject: [PATCH] Linting long lines --- app/client/components/ActionLog.ts | 10 ++++++++-- app/client/components/ChartView.ts | 5 +++-- app/client/components/DataTables.ts | 5 ++++- app/client/components/DocumentUsage.ts | 4 +++- app/client/models/DocPageModel.ts | 26 ++++++++++++++++++-------- app/client/ui/AccountPage.ts | 4 +++- app/client/ui/ApiKey.ts | 6 ++++-- app/client/ui/DocTour.ts | 3 ++- app/client/ui/DocumentSettings.ts | 2 +- app/client/ui/DuplicateTable.ts | 7 +++---- app/client/ui/ExampleInfo.ts | 3 ++- app/client/ui/MakeCopyMenu.ts | 3 ++- app/client/ui/errorPages.ts | 5 +++-- 13 files changed, 56 insertions(+), 27 deletions(-) diff --git a/app/client/components/ActionLog.ts b/app/client/components/ActionLog.ts index aa0bdb9d..46553a53 100644 --- a/app/client/components/ActionLog.ts +++ b/app/client/components/ActionLog.ts @@ -395,7 +395,10 @@ export class ActionLog extends dispose.Disposable implements IDomComponent { const newName = tableRename[1]; if (!newName) { // TODO - find a better way to send informative notifications. - gristNotify(t("Table {{tableId}} was subsequently removed in action #{{actionNum}}", {tableId:tableId, actionNum: action.actionNum})); + gristNotify(t( + "Table {{tableId}} was subsequently removed in action #{{actionNum}}", + {tableId:tableId, actionNum: action.actionNum} + )); return; } tableId = newName; @@ -416,7 +419,10 @@ export class ActionLog extends dispose.Disposable implements IDomComponent { const newName = columnRename[1]; if (!newName) { // TODO - find a better way to send informative notifications. - gristNotify(t("Column {{colId}} was subsequently removed in action #{{action.actionNum}}", {colId, actionNum: action.actionNum})); + gristNotify(t( + "Column {{colId}} was subsequently removed in action #{{action.actionNum}}", + {colId, actionNum: action.actionNum} + )); return; } colId = newName; diff --git a/app/client/components/ChartView.ts b/app/client/components/ChartView.ts index 0f025002..72953dfd 100644 --- a/app/client/components/ChartView.ts +++ b/app/client/components/ChartView.ts @@ -656,8 +656,9 @@ export class ChartConfig extends GrainJSDisposable { ), dom.domComputed(this._optionsObj.prop('errorBars'), (value: ChartOptions["errorBars"]) => value === 'symmetric' ? cssRowHelp(t("Each Y series is followed by a series for the length of error bars.")) : - value === 'separate' ? cssRowHelp(t("Each Y series is followed by two series, for top and bottom error bars.")) : - null + value === 'separate' ? cssRowHelp(t("Each Y series is followed by two series, for " + + "top and bottom error bars.")) + : null ), ]), diff --git a/app/client/components/DataTables.ts b/app/client/components/DataTables.ts index 9f169b6a..c8565137 100644 --- a/app/client/components/DataTables.ts +++ b/app/client/components/DataTables.ts @@ -160,7 +160,10 @@ export class DataTables extends Disposable { function doRemove() { return docModel.docData.sendAction(['RemoveTable', r.tableId()]); } - confirmModal(t("Delete {{formattedTableName}} data, and remove it from all pages?", {formattedTableName : r.formattedTableName()}), 'Delete', doRemove); + confirmModal(t( + "Delete {{formattedTableName}} data, and remove it from all pages?", + {formattedTableName : r.formattedTableName()} + ), 'Delete', doRemove); } private _tableRows(table: TableRec) { diff --git a/app/client/components/DocumentUsage.ts b/app/client/components/DocumentUsage.ts index 0be8a7ab..243c6f64 100644 --- a/app/client/components/DocumentUsage.ts +++ b/app/client/components/DocumentUsage.ts @@ -149,7 +149,9 @@ export class DocumentUsage extends Disposable { return dom.domComputed((use) => { const isAccessDenied = use(this._isAccessDenied); if (isAccessDenied === null) { return null; } - if (isAccessDenied) { return buildMessage(t("Usage statistics are only available to users with full access to the document data.")); } + if (isAccessDenied) { + return buildMessage(t("Usage statistics are only available to users with full access to the document data.")); + } const org = use(this._currentOrg); const product = use(this._currentProduct); diff --git a/app/client/models/DocPageModel.ts b/app/client/models/DocPageModel.ts index 0b15ec72..a6ebd15c 100644 --- a/app/client/models/DocPageModel.ts +++ b/app/client/models/DocPageModel.ts @@ -239,14 +239,24 @@ export class DocPageModelImpl extends Disposable implements DocPageModel { t("Error accessing document"), t("Reload"), async () => window.location.reload(true), - isDocOwner ? t("You can try reloading the document, or using recovery mode. Recovery mode opens the document to be fully accessible to owners, and inaccessible to others. It also disables formulas. [{{error}}]", {error: err.message}) : - isDenied ? t('Sorry, access to this document has been denied. [{{error}}]', {error: err.message}) : - t("Document owners can attempt to recover the document. [{{error}}]", {error: err.message}), - { hideCancel: true, - extraButtons: (isDocOwner && !isDenied) ? bigBasicButton(t("Enter recovery mode"), dom.on('click', async () => { - await this._api.getDocAPI(this.currentDocId.get()!).recover(true); - window.location.reload(true); - }), testId('modal-recovery-mode')) : null, + isDocOwner + ? t("You can try reloading the document, or using recovery mode. " + + "Recovery mode opens the document to be fully accessible to " + + "owners, and inaccessible to others. It also disables " + + "formulas. [{{error}}]", {error: err.message}) + : isDenied + ? t('Sorry, access to this document has been denied. [{{error}}]', {error: err.message}) + : t("Document owners can attempt to recover the document. [{{error}}]", {error: err.message}), + { + hideCancel: true, + extraButtons: !(isDocOwner && !isDenied) ? null : bigBasicButton( + t("Enter recovery mode"), + dom.on('click', async () => { + await this._api.getDocAPI(this.currentDocId.get()!).recover(true); + window.location.reload(true); + }), + testId('modal-recovery-mode') + ) }, ); } diff --git a/app/client/ui/AccountPage.ts b/app/client/ui/AccountPage.ts index 383fd21f..b2fa4fb2 100644 --- a/app/client/ui/AccountPage.ts +++ b/app/client/ui/AccountPage.ts @@ -113,7 +113,9 @@ export class AccountPage extends Disposable { ), css.subHeader(t("Two-factor authentication")), css.description( - t("Two-factor authentication is an extra layer of security for your Grist account designed to ensure that you're the only person who can access your account, even if someone knows your password.") + t("Two-factor authentication is an extra layer of security for your Grist account " + + "designed to ensure that you're the only person who can access your account, " + + "even if someone knows your password.") ), dom.create(MFAConfig, user), ), diff --git a/app/client/ui/ApiKey.ts b/app/client/ui/ApiKey.ts index 0c9bdec2..aca4d6da 100644 --- a/app/client/ui/ApiKey.ts +++ b/app/client/ui/ApiKey.ts @@ -78,7 +78,8 @@ export class ApiKey extends Disposable { dom.maybe((use) => !(use(this._apiKey) || this._anonymous), () => [ basicButton(t("Create"), dom.on('click', () => this._onCreate()), testId('create'), dom.boolAttr('disabled', this._loading)), - description(t("By generating an API key, you will be able to make API calls for your own account."), testId('description')), + description(t("By generating an API key, you will be able to " + + "make API calls for your own account."), testId('description')), ]), ); } @@ -112,7 +113,8 @@ export class ApiKey extends Disposable { confirmModal( t("Remove API Key"), t("Remove"), () => this._onDelete(), - t("You're about to delete an API key. This will cause all future requests using this API key to be rejected. Do you still want to delete?") + t("You're about to delete an API key. This will cause all future requests " + + "using this API key to be rejected. Do you still want to delete?") ); } } diff --git a/app/client/ui/DocTour.ts b/app/client/ui/DocTour.ts index 27351d91..86b6bb10 100644 --- a/app/client/ui/DocTour.ts +++ b/app/client/ui/DocTour.ts @@ -21,7 +21,8 @@ export async function startDocTour(docData: DocData, docComm: DocComm, onFinishC const invalidDocTour: IOnBoardingMsg[] = [{ title: t("No valid document tour"), - body: t("Cannot construct a document tour from the data in this document. Ensure there is a table named GristDocTour with columns Title, Body, Placement, and Location."), + body: t("Cannot construct a document tour from the data in this document. " + + "Ensure there is a table named GristDocTour with columns Title, Body, Placement, and Location."), selector: 'document', showHasModal: true, }]; diff --git a/app/client/ui/DocumentSettings.ts b/app/client/ui/DocumentSettings.ts index bbe3bd08..83dd5b23 100644 --- a/app/client/ui/DocumentSettings.ts +++ b/app/client/ui/DocumentSettings.ts @@ -58,7 +58,7 @@ export async function showDocSettingsModal(docInfo: DocInfoRec, docPageModel: Do canChangeEngine ? [ // Small easter egg: you can click on the skull-and-crossbones to // force a reload of the document. - cssDataRow(t("Engine (experimental {{span}} change at own risk):", {span: + cssDataRow(t("Engine (experimental {{span}} change at own risk):", {span: dom('span', '☠', dom.style('cursor', 'pointer'), dom.on('click', async () => { diff --git a/app/client/ui/DuplicateTable.ts b/app/client/ui/DuplicateTable.ts index 7fda7b4e..d3437c9c 100644 --- a/app/client/ui/DuplicateTable.ts +++ b/app/client/ui/DuplicateTable.ts @@ -83,10 +83,9 @@ class DuplicateTableModal extends Disposable { ), cssWarning( cssWarningIcon('Warning'), - - dom('div', - t("Instead of duplicating tables, it's usually better to segment data using linked views. {{link}}", {link: cssLink({href: commonUrls.helpLinkingWidgets, target: '_blank'}, 'Read More.')}) - ), //TODO: i18next + dom('div', t("Instead of duplicating tables, it's usually better to segment data using linked views. {{link}}", + {link: cssLink({href: commonUrls.helpLinkingWidgets, target: '_blank'}, 'Read More.')} + )), ), cssField( cssCheckbox( diff --git a/app/client/ui/ExampleInfo.ts b/app/client/ui/ExampleInfo.ts index c8f3e8f1..471b2e34 100644 --- a/app/client/ui/ExampleInfo.ts +++ b/app/client/ui/ExampleInfo.ts @@ -36,7 +36,8 @@ export const buildExamples = (): IExampleInfo[] => [{ tutorialUrl: 'https://support.getgrist.com/investment-research/', welcomeCard: { title: t("Welcome to the Investment Research template"), - text: t("Check out our related tutorial to learn how to create summary tables and charts, and to link charts dynamically."), + text: t("Check out our related tutorial to learn how to create " + + "summary tables and charts, and to link charts dynamically."), tutorialName: t("Tutorial: Analyze & Visualize"), }, }, { diff --git a/app/client/ui/MakeCopyMenu.ts b/app/client/ui/MakeCopyMenu.ts index bfdbf8b1..6978c5d1 100644 --- a/app/client/ui/MakeCopyMenu.ts +++ b/app/client/ui/MakeCopyMenu.ts @@ -41,7 +41,8 @@ export async function replaceTrunkWithFork(user: FullUser|null, doc: Document, a if (cmp.summary === 'left' || cmp.summary === 'both') { titleText = t("Original Has Modifications"); buttonText = t("Overwrite"); - warningText = `${warningText} ${t("Be careful, the original has changes not in this document. Those changes will be overwritten.")}`; + warningText = `${warningText} ${t("Be careful, the original has changes " + + "not in this document. Those changes will be overwritten.")}`; } else if (cmp.summary === 'unrelated') { titleText = t("Original Looks Unrelated"); buttonText = t("Overwrite"); diff --git a/app/client/ui/errorPages.ts b/app/client/ui/errorPages.ts index 8e9f492a..a6eea10d 100644 --- a/app/client/ui/errorPages.ts +++ b/app/client/ui/errorPages.ts @@ -35,7 +35,8 @@ export function createForbiddenPage(appModel: AppModel, message?: string) { return pagePanelsError(appModel, t("Access denied{{suffix}}", {suffix: ''}), [ dom.domComputed(appModel.currentValidUser, user => user ? [ cssErrorText(message || t("You do not have access to this organization's documents.")), - cssErrorText(t("You are signed in as {{email}}. You can sign in with a different account, or ask an administrator for access.", {email: dom('b', user.email)})), // TODO: i18next + cssErrorText(t("You are signed in as {{email}}. You can sign in with a different " + + "account, or ask an administrator for access.", {email: dom('b', user.email)})), ] : [ // This page is not normally shown because a logged out user with no access will get // redirected to log in. But it may be seen if a user logs out and returns to a cached @@ -58,7 +59,7 @@ export function createForbiddenPage(appModel: AppModel, message?: string) { export function createSignedOutPage(appModel: AppModel) { document.title = t("Signed out{{suffix}}", {suffix: getPageTitleSuffix(getGristConfig())}); - return pagePanelsError(appModel, t("Signed out{{suffix}}", {suffix: ''}), [ + return pagePanelsError(appModel, t("Signed out{{suffix}}", {suffix: ''}), [ cssErrorText(t("You are now signed out.")), cssButtonWrap(bigPrimaryButtonLink( t("Sign in again"), {href: getLoginUrl()}, testId('error-signin')