From a253920dd578e3e00b4943cc6a37669f89227b89 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Thu, 7 Sep 2023 20:15:40 +0200 Subject: [PATCH] chore: Linter issues --- plugins/plugin-annotations/src/banner.mjs | 2 +- plugins/plugin-annotations/src/crossbox.mjs | 5 +---- plugins/plugin-annotations/src/cutonfold.mjs | 5 +---- plugins/plugin-annotations/src/dimensions.mjs | 2 +- plugins/plugin-annotations/src/flag.mjs | 6 +++--- plugins/plugin-annotations/src/grainline.mjs | 2 +- plugins/plugin-annotations/src/pleat.mjs | 2 +- plugins/plugin-annotations/src/sewtogether.mjs | 2 +- sites/shared/components/workbench/views/flags.mjs | 1 - sites/shared/components/workbench/views/measies/index.mjs | 6 +----- 10 files changed, 11 insertions(+), 22 deletions(-) diff --git a/plugins/plugin-annotations/src/banner.mjs b/plugins/plugin-annotations/src/banner.mjs index 404f28d245d..66ea79ce29e 100644 --- a/plugins/plugin-annotations/src/banner.mjs +++ b/plugins/plugin-annotations/src/banner.mjs @@ -22,7 +22,7 @@ const rmbanner = function (id = macroDefaults.id, { paths, store, part }) { delete paths[pid] } -const banner = function (config, { part, paths, store, log, complete }) { +const banner = function (config, { part, paths, store, complete }) { /* * Don't add a banne when complete is false, unless force is true */ diff --git a/plugins/plugin-annotations/src/crossbox.mjs b/plugins/plugin-annotations/src/crossbox.mjs index 31c9989668b..87edd882798 100644 --- a/plugins/plugin-annotations/src/crossbox.mjs +++ b/plugins/plugin-annotations/src/crossbox.mjs @@ -29,10 +29,7 @@ const rmcrossbox = function (id = macroDefaults.id, { paths, points, store, part /* * The crossbox macro */ -const crossbox = function ( - config, - { points, Point, paths, Path, getId, complete, store, log, part } -) { +const crossbox = function (config, { points, Point, paths, Path, complete, store, log, part }) { /* * Don't add a title when complete is false, unless force is true */ diff --git a/plugins/plugin-annotations/src/cutonfold.mjs b/plugins/plugin-annotations/src/cutonfold.mjs index 55212560ffc..8d05fe11232 100644 --- a/plugins/plugin-annotations/src/cutonfold.mjs +++ b/plugins/plugin-annotations/src/cutonfold.mjs @@ -46,10 +46,7 @@ const rmcutonfold = function (id = macroDefaults.id, { paths, store, part }) { /* * The cutonfold macro */ -const cutonfold = function ( - config, - { points, paths, Path, complete, store, scale, log, Point, part } -) { +const cutonfold = function (config, { paths, Path, complete, store, scale, log, Point, part }) { /* * Don't add a cutonfold indicator when complete is false, unless force is true */ diff --git a/plugins/plugin-annotations/src/dimensions.mjs b/plugins/plugin-annotations/src/dimensions.mjs index a0506f357ca..b4afcbaf3a5 100644 --- a/plugins/plugin-annotations/src/dimensions.mjs +++ b/plugins/plugin-annotations/src/dimensions.mjs @@ -128,7 +128,7 @@ const addDimension = (config, props, type) => { * Draw the dimension */ if (type === 'pd') { - if (typeof mc.d === 'undefined') mc.d = 10 * scale + if (typeof mc.d === 'undefined') mc.d = 10 * props.scale props.paths[ids.line] = mc.path .offset(mc.d) .attr('class', mc.classes.line) diff --git a/plugins/plugin-annotations/src/flag.mjs b/plugins/plugin-annotations/src/flag.mjs index bcf99af03f5..3f87691b9e3 100644 --- a/plugins/plugin-annotations/src/flag.mjs +++ b/plugins/plugin-annotations/src/flag.mjs @@ -51,9 +51,9 @@ function flag(type, store, data) { * @param {id} string - The flag id to remove */ function unflag(type, store, id) { - if (type === 'preset' && presets[preset]) { - id = presets[preset].id || presets[preset].msg - type = presets[preset].type + if (type === 'preset' && presets[id]) { + type = presets[id].type + id = presets[id].id || presets[id].msg } store.unset([...storeRoot, type, id]) } diff --git a/plugins/plugin-annotations/src/grainline.mjs b/plugins/plugin-annotations/src/grainline.mjs index 1927e75886c..564c8445dd5 100644 --- a/plugins/plugin-annotations/src/grainline.mjs +++ b/plugins/plugin-annotations/src/grainline.mjs @@ -44,7 +44,7 @@ const rmgrainline = function (id = macroDefaults.id, { paths, store, part }) { /* * The grainline macro */ -const grainline = function (config = {}, { points, paths, Path, complete, store, part }) { +const grainline = function (config = {}, { paths, Path, Point, complete, store, log, part }) { /* * Don't add a cutonfold indicator when complete is false, unless force is true */ diff --git a/plugins/plugin-annotations/src/pleat.mjs b/plugins/plugin-annotations/src/pleat.mjs index 3d20d8a2a8e..19ea582be29 100644 --- a/plugins/plugin-annotations/src/pleat.mjs +++ b/plugins/plugin-annotations/src/pleat.mjs @@ -39,7 +39,7 @@ const rmpleat = function (id = macroDefaults.id, { paths, store, part }) { /* * The pleat macro */ -const pleat = function (config, { points, paths, Path, complete, scale, store, part }) { +const pleat = function (config, { paths, Path, log, Point, complete, scale, store, part }) { /* * Don't add a pleat when complete is false, unless force is true */ diff --git a/plugins/plugin-annotations/src/sewtogether.mjs b/plugins/plugin-annotations/src/sewtogether.mjs index 810ae516250..827b7fdcaaa 100644 --- a/plugins/plugin-annotations/src/sewtogether.mjs +++ b/plugins/plugin-annotations/src/sewtogether.mjs @@ -52,7 +52,7 @@ const rmsewtogether = function (id = macroDefaults.id, { paths, store, part }) { /* * The sewtogether macro */ -const sewtogether = function (config, { points, paths, Path, complete, sa, store, part }) { +const sewtogether = function (config, { paths, Path, log, Point, complete, sa, store, part }) { /* * Don't add a title when complete is false, unless force is true */ diff --git a/sites/shared/components/workbench/views/flags.mjs b/sites/shared/components/workbench/views/flags.mjs index dc76a4c9255..486443a61f1 100644 --- a/sites/shared/components/workbench/views/flags.mjs +++ b/sites/shared/components/workbench/views/flags.mjs @@ -7,7 +7,6 @@ import { useTranslation } from 'next-i18next' import { useState } from 'react' // Components import { - CloseIcon, ChatIcon, TipIcon, WarningIcon, diff --git a/sites/shared/components/workbench/views/measies/index.mjs b/sites/shared/components/workbench/views/measies/index.mjs index 7153f5b15a5..aba05b62da0 100644 --- a/sites/shared/components/workbench/views/measies/index.mjs +++ b/sites/shared/components/workbench/views/measies/index.mjs @@ -1,12 +1,10 @@ // Dependencies -import { Fragment, useContext } from 'react' +import { Fragment } from 'react' import { nsMerge } from 'shared/utils.mjs' import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs' import { designMeasurements, horFlexClasses } from 'shared/utils.mjs' // Hooks import { useTranslation } from 'next-i18next' -// Context -import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs' // Components import { UserSetPicker, @@ -25,7 +23,6 @@ const iconClasses = { className: 'w-8 h-8 md:w-10 md:h-10 lg:w-12 lg:h-12 shrink export const MeasiesView = ({ design, Design, settings, update, missingMeasurements, setView }) => { const { t } = useTranslation(['workbench']) - const { setLoadingStatus } = useContext(LoadingStatusContext) const loadMeasurements = (set) => { update.settings([ @@ -33,7 +30,6 @@ export const MeasiesView = ({ design, Design, settings, update, missingMeasureme [['units'], set.imperial ? 'imperial' : 'metric'], ]) setView('draft') - //setLoadingStatus([true, 'workbench:appliedMeasies', true, true]) } return (