Skip to content
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

Merged
merged 3 commits into from
Jan 18, 2024

Conversation

adrianfish
Copy link
Contributor

@adrianfish adrianfish marked this pull request as draft July 25, 2023 21:41
@jesusmmp
Copy link
Contributor

@adrianfish @ern I think we should avoid merging big changes before
tickets from Unidigital were merged. Please, take in mind. Thanks!

@mpellicer
Copy link

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.

@adrianfish
Copy link
Contributor Author

@jesusmmp @mpellicer Agreed. That's why I've put the PR up early, for transparency.

@adrianfish adrianfish force-pushed the SAK-48323 branch 3 times, most recently from 2c3aca6 to c77797e Compare August 8, 2023 12:59
@adrianfish adrianfish force-pushed the SAK-48323 branch 9 times, most recently from 75790d5 to 9fb9ada Compare August 9, 2023 10:27
@adrianfish adrianfish marked this pull request as ready for review August 9, 2023 14:05
@adrianfish
Copy link
Contributor Author

@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?

@mpellicer
Copy link

@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:
https://github.com/sakaiproject/sakai/commits/s2u-22x/webcomponents

4e3956c
0d8b791

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

@adrianfish
Copy link
Contributor Author

@mpellicer @bgarciaentornos
This PR's getting a bit painful with the conflicts and I'd like to get it in soonish, if possible. So, if we could get any webcomponents PRs into master soon for review, that would be great.

@mpellicer
Copy link

mpellicer commented Sep 26, 2023

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
https://sakaiproject.atlassian.net/browse/S2U-5

@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

@ern
Copy link
Contributor

ern commented Nov 29, 2023

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!!!

Copy link
Contributor

@stetsche stetsche left a 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.

library/src/webapp/js/sakai-message-broker.js Outdated Show resolved Hide resolved
"keywords": [
"fontawesome"
],
"author": "The Sakai Project <[email protected]>",
Copy link
Contributor

@stetsche stetsche Jan 15, 2024

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)

@adrianfish adrianfish force-pushed the SAK-48323 branch 3 times, most recently from 0dddebb to 7cd3b26 Compare January 18, 2024 11:16
@adrianfish
Copy link
Contributor Author

Regarding the package author entries:
https://docs.npmjs.com/cli/v10/configuring-npm/package-json#people-fields-author-contributors

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.

@stetsche
Copy link
Contributor

stetsche commented Jan 18, 2024

Regarding the package author entries:

Maybe we can just use:

{
  "name": "...",
  "url": "..."
}

Both email and url are optional either way.

Or possibly sakai-dev list as email?

@adrianfish
Copy link
Contributor Author

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.

@adrianfish adrianfish merged commit f590201 into sakaiproject:master Jan 18, 2024
4 checks passed
@adrianfish adrianfish deleted the SAK-48323 branch January 18, 2024 15:41
kunaljaykam pushed a commit to kunaljaykam/sakai that referenced this pull request Jan 24, 2024
kunaljaykam pushed a commit to kunaljaykam/sakai that referenced this pull request Jan 25, 2024
ern pushed a commit that referenced this pull request Apr 2, 2024
(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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants