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

feat: EU component Icon #15

Merged
merged 9 commits into from
Feb 12, 2019
Merged

feat: EU component Icon #15

merged 9 commits into from
Feb 12, 2019

Conversation

nimek2
Copy link
Contributor

@nimek2 nimek2 commented Feb 7, 2019

No description provided.

@hapertown
Copy link

deploy/netlify failed - the problem is probably on the environment configuration side. Do you not have to configure the webpack.config.js like here file for the EU in the same way as for the EC file to correctly display the svg file?

@planctus planctus self-assigned this Feb 8, 2019
"access": "public"
},
"devDependencies": {
"@ecl/ec-resources-icons": "^2.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nimek2 , the thing here is that you are providing a component as part of an ecosystem, in this case is EU so your resources should come from the EU implementation of ECL in this case, and all of your imports then would use the resources provided by this package, not the EC one.. ;)

For the rest yes, the problem about the icons not rendering is due to webpack conf, i will fix that, once you fix this EC-EU confusion the pull request will be merged, we already reviewed the EC version.
Thanks!

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed and commited the resource from ec-resources-icons to eu-resources-icons, is it enough?

Copy link
Contributor

@planctus planctus left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's only about using the right resources, will be quick ;)

import path from 'path';
import { renderTwigFile } from '@ecl-twig/test-utils';

import brandedIcons from '@ecl/ec-resources-icons/dist/lists/branded.json';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we are fetching the eu package for the resources we should use the icons from that one, so here we would import from the EU package and not the EC one.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in b49cf0a
commit

import notificationsIcons from '@ecl/ec-resources-icons/dist/lists/notifications.json';
import uiIcons from '@ecl/ec-resources-icons/dist/lists/ui.json';
import defaultSprite from '@ecl/ec-resources-icons/dist/sprites/icons.svg';
import brandedIcons from '@ecl/eu-resources-icons/dist/lists/branded.json';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess there is a confusion between EC and EU here...
EC components (as this file), should use EC dependencies, no EU, and the same for the other way

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed here 7b43a89

That was stupid mistake

@@ -0,0 +1,40 @@
# ECL Twig - EC Icon component
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there should be no reference to EC in this file (including npm package below, and so on)

import { withNotes } from '@ecl-twig/storybook-addon-notes';
import withCode from '@ecl-twig/storybook-addon-code';

import brandedIcons from '@ecl/ec-resources-icons/dist/lists/branded.json';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be EU everywhere here too


import brandedIcons from '@ecl/ec-resources-icons/dist/lists/branded.json';
import generalIcons from '@ecl/ec-resources-icons/dist/lists/general.json';
import notificationsIcons from '@ecl/ec-resources-icons/dist/lists/notifications.json';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should be EU everywhere here too

@hapertown
Copy link

hapertown commented Feb 11, 2019

All pathes fixed in latest commits. I will pay more attention to the correct paths of resources for next PRs, so that we will not repeat this problem, thanks for your help.

@emeryro
Copy link
Contributor

emeryro commented Feb 12, 2019

Almost there.
Please just make sure to use EC in EC related components (#15 (comment))

@emeryro emeryro assigned emeryro and unassigned planctus Feb 12, 2019
@nimek2
Copy link
Contributor Author

nimek2 commented Feb 12, 2019

@emeryro

All fixes done (including focusable parameter)
Auto test passed so can we merge it now?

@nimek2 nimek2 added pr: review needed Use this label to show that your PR needs to be review and removed pr: modification needed labels Feb 12, 2019
planctus
planctus previously approved these changes Feb 12, 2019
@nimek2
Copy link
Contributor Author

nimek2 commented Feb 12, 2019

@emeryro

Aria-hidden parameter added. SO now we are good here?

@emeryro emeryro merged commit 9542050 into master Feb 12, 2019
@emeryro emeryro deleted the eu-component-icon branch February 12, 2019 10:48
@yhuard yhuard removed the pr: review needed Use this label to show that your PR needs to be review label Feb 12, 2019
@yhuard yhuard removed pr: review needed Use this label to show that your PR needs to be review pr: under review labels Feb 21, 2019
@yhuard yhuard removed pr: modification needed pr: review needed Use this label to show that your PR needs to be review pr: under review labels Mar 4, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants