Skip to content
This repository has been archived by the owner on May 2, 2023. It is now read-only.

Commit

Permalink
refactor(utils): tabLabels instead of buttonLabels - FRONT-962 (#396)
Browse files Browse the repository at this point in the history
  • Loading branch information
planctus committed Apr 1, 2020
1 parent abc9a1b commit fd8be0f
Show file tree
Hide file tree
Showing 26 changed files with 256 additions and 340 deletions.
16 changes: 6 additions & 10 deletions src/ec/packages/ec-component-accordion/accordion.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { storiesOf } from '@storybook/html';
import { withKnobs, text, select } from '@storybook/addon-knobs';
import { withNotes } from '@ecl-twig/storybook-addon-notes';
import { getExtraKnobs, buttonLabels } from '@ecl-twig/story-utils';
import { getExtraKnobs, tabLabels } from '@ecl-twig/story-utils';
import withCode from '@ecl-twig/storybook-addon-code';
import defaultSprite from '@ecl/ec-resources-icons/dist/sprites/icons.svg';
import demoData from './demo/data';
Expand All @@ -18,24 +18,20 @@ const preprareAccordion = data => {
`items[${index}].level`,
levels,
level,
buttonLabels.required
);
item.id = select(`items[${index}].id`, [id], id, buttonLabels.required);
item.content = text(
`items[${index}].content`,
content,
buttonLabels.required
tabLabels.required
);
item.id = select(`items[${index}].id`, [id], id, tabLabels.required);
item.content = text(`items[${index}].content`, content, tabLabels.required);
item.toggle.label = text(
`items[${index}].toggle.label`,
toggle.label,
buttonLabels.required
tabLabels.required
);
item.toggle.icon.path = select(
`items[${index}].toggle.icon.path`,
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);
getExtraKnobs(data);
});
Expand Down
16 changes: 6 additions & 10 deletions src/ec/packages/ec-component-accordion2/accordion2.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { storiesOf } from '@storybook/html';
import { withKnobs, text, select } from '@storybook/addon-knobs';
import { withNotes } from '@ecl-twig/storybook-addon-notes';
import { getExtraKnobs, buttonLabels } from '@ecl-twig/story-utils';
import { getExtraKnobs, tabLabels } from '@ecl-twig/story-utils';
import withCode from '@ecl-twig/storybook-addon-code';
import defaultSprite from '@ecl/ec-resources-icons/dist/sprites/icons.svg';
import demoData from './demo/data';
Expand All @@ -18,24 +18,20 @@ const prepareAccordion2 = data => {
`items[${index}].level`,
levels,
level,
buttonLabels.required
);
item.id = select(`items[${index}].id`, [id], id, buttonLabels.required);
item.content = text(
`items[${index}].content`,
content,
buttonLabels.required
tabLabels.required
);
item.id = select(`items[${index}].id`, [id], id, tabLabels.required);
item.content = text(`items[${index}].content`, content, tabLabels.required);
item.toggle.label = text(
`items[${index}].toggle.label`,
toggle.label,
buttonLabels.required
tabLabels.required
);
item.toggle.icon.path = select(
`items[${index}].toggle.icon.path`,
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);
});

Expand Down
22 changes: 9 additions & 13 deletions src/ec/packages/ec-component-button/button.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import { storiesOf } from '@storybook/html';
import { withKnobs, text, select, boolean } from '@storybook/addon-knobs';
import { withNotes } from '@ecl-twig/storybook-addon-notes';
import withCode from '@ecl-twig/storybook-addon-code';
import {
getExtraKnobs,
buttonLabels,
getIconKnobs,
} from '@ecl-twig/story-utils';
import { getExtraKnobs, tabLabels, getIconKnobs } from '@ecl-twig/story-utils';
// Import data for demos
import dataPrimary from '@ecl/ec-specs-button/demo/data--primary';
import dataSecondary from '@ecl/ec-specs-button/demo/data--secondary';
Expand All @@ -28,14 +24,14 @@ uiIcons.forEach(icon => {

// Preserve the adapted specs.
const prepareButton = data => {
data.disabled = boolean('disabled', data.disabled, buttonLabels.states);
data.label = text('label', data.label, buttonLabels.required);
data.disabled = boolean('disabled', data.disabled, tabLabels.states);
data.label = text('label', data.label, tabLabels.required);

data.variant = select(
'variant',
[data.variant],
data.variant,
buttonLabels.required
tabLabels.required
);

getExtraKnobs(data);
Expand All @@ -51,7 +47,7 @@ storiesOf('Components/Button', module)
'primary',
() => {
const data = prepareButton(dataPrimary);
const name = select('icon.name', iconsList, null, buttonLabels.optional);
const name = select('icon.name', iconsList, null, tabLabels.optional);
if (name !== null) {
getIconKnobs(data, name, 'ui', 'xs');
}
Expand All @@ -66,7 +62,7 @@ storiesOf('Components/Button', module)
'secondary',
() => {
const data = prepareButton(dataSecondary);
const name = select('icon.name', iconsList, null, buttonLabels.optional);
const name = select('icon.name', iconsList, null, tabLabels.optional);
if (name !== null) {
getIconKnobs(data, name, 'ui', 'xs');
}
Expand All @@ -85,7 +81,7 @@ storiesOf('Components/Button', module)
'icon.name',
iconsList,
'corner-arrow',
buttonLabels.optional
tabLabels.optional
);
if (name !== null) {
getIconKnobs(data, name, 'ui', 'xs', 'default', 'rotate-90');
Expand All @@ -101,7 +97,7 @@ storiesOf('Components/Button', module)
'text',
() => {
const data = prepareButton(dataGhost);
const name = select('icon.name', iconsList, null, buttonLabels.optional);
const name = select('icon.name', iconsList, null, tabLabels.optional);
if (name !== null) {
getIconKnobs(data, name, 'ui', 'xs');
}
Expand All @@ -116,7 +112,7 @@ storiesOf('Components/Button', module)
'search',
() => {
const data = prepareButton(dataSearch);
const name = select('icon.name', iconsList, null, buttonLabels.optional);
const name = select('icon.name', iconsList, null, tabLabels.optional);
if (name !== null) {
getIconKnobs(data, name, 'ui', 'xs');
}
Expand Down
17 changes: 4 additions & 13 deletions src/ec/packages/ec-component-checkbox/checkbox.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
import { storiesOf } from '@storybook/html';
import { withKnobs, select } from '@storybook/addon-knobs';
import { withNotes } from '@ecl-twig/storybook-addon-notes';
import {
getExtraKnobs,
getFormKnobs,
buttonLabels,
} from '@ecl-twig/story-utils';
import { getExtraKnobs, getFormKnobs, tabLabels } from '@ecl-twig/story-utils';
import withCode from '@ecl-twig/storybook-addon-code';

import defaultSprite from '@ecl/ec-resources-icons/dist/sprites/icons.svg';
Expand All @@ -18,23 +14,18 @@ const prepareCheckbox = data => {
getFormKnobs(data);

data.items.forEach((item, i) => {
item.id = select(
`items[${i}].id`,
[item.id],
item.id,
buttonLabels.required
);
item.id = select(`items[${i}].id`, [item.id], item.id, tabLabels.required);
item.value = select(
`items[${i}].value`,
[item.value],
item.value,
buttonLabels.required
tabLabels.required
);
item.icon_path = select(
`items[${i}]icon_path`,
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);
});

Expand Down
16 changes: 4 additions & 12 deletions src/ec/packages/ec-component-datepicker/datepicker.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@ import { storiesOf } from '@storybook/html';
import { withNotes } from '@ecl-twig/storybook-addon-notes';
import { withKnobs, text, select } from '@storybook/addon-knobs';
import withCode from '@ecl-twig/storybook-addon-code';
import {
getExtraKnobs,
buttonLabels,
getFormKnobs,
} from '@ecl-twig/story-utils';
import { getExtraKnobs, tabLabels, getFormKnobs } from '@ecl-twig/story-utils';

import defaultSprite from '@ecl/ec-resources-icons/dist/sprites/icons.svg';
import dataDefault from './demo/data';
Expand All @@ -16,19 +12,15 @@ import notes from './README.md';

const prepareDatePicker = data => {
getFormKnobs(data);
data.label = text('label', data.label, buttonLabels.required);
data.label = text('label', data.label, tabLabels.required);
data.icons_path = select(
'icons_path',
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);

data.placeholder = text(
'placeholder',
data.placeholder,
buttonLabels.required
);
data.placeholder = text('placeholder', data.placeholder, tabLabels.required);

getExtraKnobs(data);

Expand Down
32 changes: 16 additions & 16 deletions src/ec/packages/ec-component-file/file.story.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { storiesOf } from '@storybook/html';
import { withKnobs, text, select } from '@storybook/addon-knobs';
import { withNotes } from '@ecl-twig/storybook-addon-notes';
import { getExtraKnobs, buttonLabels } from '@ecl-twig/story-utils';
import { getExtraKnobs, tabLabels } from '@ecl-twig/story-utils';
import withCode from '@ecl-twig/storybook-addon-code';

import defaultSprite from '@ecl/ec-resources-icons/dist/sprites/icons.svg';
Expand All @@ -13,76 +13,76 @@ import file from './ecl-file.html.twig';
import notes from './README.md';

const prepareFile = data => {
data.title = text('title', data.title, buttonLabels.required);
data.language = text('language', data.language, buttonLabels.required);
data.meta = text('meta', data.meta, buttonLabels.required);
data.title = text('title', data.title, tabLabels.required);
data.language = text('language', data.language, tabLabels.required);
data.meta = text('meta', data.meta, tabLabels.required);
data.icon.path = select(
'icon.path',
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);
data.download.link.label = text(
'download.link.label',
data.download.link.label,
buttonLabels.required
tabLabels.required
);
data.download.icon.path = select(
'download.icon.path',
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);

if (data.translation) {
data.translation.description = text(
'translation.description',
data.translation.description,
buttonLabels.optional
tabLabels.optional
);
data.translation.toggle.label = text(
'translation.toggle.label',
data.translation.toggle.label,
buttonLabels.required
tabLabels.required
);
data.translation.toggle.icon.path = select(
'translation.toggle.icon.path',
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);

data.translation.items.forEach((item, i) => {
data.translation.items[i].title = text(
`data.translation.items[${i}].title`,
data.translation.items[i].title,
buttonLabels.required
tabLabels.required
);
data.translation.items[i].meta = text(
`data.translation.items[${i}].meta`,
data.translation.items[i].meta,
buttonLabels.required
tabLabels.required
);
data.translation.items[i].lang = text(
`data.translation.items[${i}].lang`,
data.translation.items[i].lang,
buttonLabels.required
tabLabels.required
);
data.translation.items[i].download.link.label = text(
`data.translation.items[${i}].download.link.label`,
data.translation.items[i].download.link.label,
buttonLabels.required
tabLabels.required
);
data.translation.items[i].download.link.path = text(
`data.translation.items[${i}].download.link.path`,
data.translation.items[i].download.link.path,
buttonLabels.required
tabLabels.required
);
data.translation.items[i].download.icon.path = select(
`data.translation.items[${i}].download.icon.path`,
[defaultSprite],
defaultSprite,
buttonLabels.required
tabLabels.required
);
});
}
Expand Down

0 comments on commit fd8be0f

Please sign in to comment.