-
-
Notifications
You must be signed in to change notification settings - Fork 931
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
SAK-48323 webcomponents. Bundle and remove empathise. #11789
Conversation
@adrianfish @ern I think we should avoid merging big changes before |
Agree @jesusmmp, things like this ended badly in the past. I'm in favor of any improvement that needs to be done, but always planning them with any team working on the same components, to evaluate the changes that affect the roadmap. Changes like this broke development plans in the past, and that's bad especially if they were communicated and documented for months. |
@jesusmmp @mpellicer Agreed. That's why I've put the PR up early, for transparency. |
2c3aca6
to
c77797e
Compare
75790d5
to
9fb9ada
Compare
@mpellicer Are there particular commits in the s2u branch that you are worried about? This PR mainly affects the web components, the lit stuff, so I'm hopeful we won't get a lot of overlap. Is there any chance you can prioritise merging the risky commits into master? Can you point me to those commits so I can take a look? |
@adrianfish Thanks for the attention. As far as I can tell there are only two commits, S2U-5 and S2U-34, but this PR modifies more than 600 files so I don't know what side effects will produce in our contributions to Master, the 22.x versions are just fine in that branch since I don't think this work will be ever merged into 22.x The commits are pretty clean: One feature comes from 2020 and suffered from refactors so would be good to have in Master after all, If this PR is important for Master, and considering that our features are also important for Master, I'm fine prioritizing both contributions to Master to happen soon. CC @bgarciaentornos as author of both pieces of work. Thanks again Adrian |
c8c1835
to
a5d108e
Compare
8e2c9e2
to
3a750a4
Compare
@mpellicer @bgarciaentornos |
Well @adrianfish, we have very very limited resources to contribute stuff to Master right now, but we made the weekly meeting today and I've assigned @stetsche to contribute the most critical features, with the help of @bgarciaentornos. We're going to contribute to Master these two tickets very soon: https://sakaiproject.atlassian.net/browse/S2U-34 @bgarciaentornos Do you feel that other tickets need contribution? I don't see any here: https://github.com/sakaiproject/sakai/commits/s2u-22x/webcomponents Thanks |
Adrian so this will all end up in the sakai-ui repo? and I am guessing this is the a step before that happens? If so I think it would be a good idea to update the webcomponents strategy doc and layout the direction there? this is very good direction so that we can start publishing webcomponents separately from Sakai, nice!!! |
75d785c
to
d31f8ea
Compare
a284359
to
d052b94
Compare
5a358a5
to
53502ca
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I looked over the PR again and added a few comments, I also saw some other unresolved comments. Again, I didn't go through every change in webcomponents, but I looked over a few.
webapi/src/main/java/org/sakaiproject/webapi/controllers/TasksController.java
Outdated
Show resolved
Hide resolved
"keywords": [ | ||
"fontawesome" | ||
], | ||
"author": "The Sakai Project <[email protected]>", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this makes sense (What @ern said)
...ponents/tool/src/main/frontend/packages/sakai-announcements/test/sakai-announcements.test.js
Outdated
Show resolved
Hide resolved
webcomponents/tool/src/main/frontend/packages/sakai-conversations/src/SakaiTopic.js
Outdated
Show resolved
Hide resolved
webcomponents/tool/src/main/frontend/packages/sakai-conversations/src/SakaiTopicSummary.js
Outdated
Show resolved
Hide resolved
webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricsHelpers.js
Outdated
Show resolved
Hide resolved
0dddebb
to
7cd3b26
Compare
Regarding the package author entries: It's recommended to supply the email address and the one I've used is attached to a sakai-ui npm repository at https://www.npmjs.com/~sakai-ui. At the moment we are not publishing to it as we are linking between npm modules in our bundling, but we will be at some point. |
Maybe we can just use:
Or possibly sakai-dev list as email? |
The problem is that we already have the sakai-ui namespace on npm, and the login is [email protected]. We could use the expanded multiple lines version, but the single line conforms with the way git histories show things. |
(cherry picked from commit f590201) Conflicts: assignment/tool/src/webapp/vm/assignment/instructor_new_edit/grading_section.vm portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm roster2/tool/src/webapp/js/card-game/index.js roster2/tool/src/webapp/js/roster.js samigo/samigo-app/src/webapp/jsf/evaluation/questionScore.jsp vuecomponents/tool/src/main/frontend/src/mixins/i18n-mixin.js webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubric-student-button.js webcomponents/tool/src/main/frontend/js/rubrics/sakai-rubrics-utils.js webcomponents/tool/src/main/frontend/packages/sakai-date-picker/src/SakaiDatePicker.js webcomponents/tool/src/main/frontend/packages/sakai-grader/src/sakai-grader-rendering-mixin.js webcomponents/tool/src/main/frontend/packages/sakai-notifications/src/SakaiNotifications.js webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricAssociation.js webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricGrading.js webcomponents/tool/src/main/frontend/packages/sakai-rubrics/src/SakaiRubricStudent.js
https://sakaiproject.atlassian.net/browse/SAK-48323