SAK-48323 webcomponents. Bundle and remove empathise.

https://sakaiproject.atlassian.net/browse/SAK-48323
sakaiproject · Jan 12, 2024 · 53502ca · 53502ca
1 parent 4745489
commit 53502ca
Show file tree

Hide file tree

Showing 738 changed files with 425,476 additions and 28,885 deletions.
diff --git a/.codacy.yaml b/.codacy.yaml
@@ -0,0 +1,6 @@
+---
+exclude_paths:
+  - "**/test/**"
+  - "**/tests/**"
+  - "**/bundle-entry-points/**"
+  - "**/web-test-runner.config.mjs"
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,100 @@
+module.exports = {
+  "env": { "browser": true, "es2022": true },
+  "globals": {
+    "$": "readonly",
+    "bootstrap": "readonly",
+    "sakai": "readonly",
+    "sakaiSessionId": "readonly",
+    "portal": "readonly",
+    "profile": "readonly",
+    "CKEDITOR": "readonly",
+    "moment": "readonly",
+    "confirmDatePlugin": "readonly",
+    "flatpickr": "readonly",
+    "jQuery": "readonly",
+    "MathJax": "readonly",
+    "globalThis": "readonly",
+  },
+  "extends": [ "eslint:recommended" ],
+  "parserOptions": { "ecmaVersion": 2022, "sourceType": "module" },
+  "rules": {
+    "accessor-pairs": "error",
+    "array-bracket-spacing": [ 'error', 'always' ],
+    "array-callback-return": "error",
+    "arrow-parens": [ "error", "as-needed" ],
+    "arrow-spacing": "error",
+    "block-spacing": "error",
+    "camelcase" : "error",
+    "comma-spacing": "error",
+    "curly": [ "error", "multi-line" ],
+    "dot-notation": "error",
+    "indent": ["warn", 2, { "SwitchCase": 1, "MemberExpression": "off", "ImportDeclaration": "off", "ignoredNodes": ["TemplateLiteral > *"] }],
+    "keyword-spacing": "error",
+    "linebreak-style": ["error", "unix"],
+    "no-array-constructor": "error",
+    "no-caller": "error",
+    "no-cond-assign": "error",
+    "no-constructor-return": "error",
+    "no-duplicate-imports": "error",
+    "no-else-return": "error",
+    "no-empty": ["error", { allowEmptyCatch: true }],
+    "no-eval": "error",
+    "no-extend-native": ["error", { "exceptions": ["Date"] }],
+    "no-extra-bind": "error",
+    "no-implied-eval": "error",
+    "no-iterator": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-lonely-if": "error",
+    "no-loop-func": "error",
+    "no-loss-of-precision": "error",
+    "no-multi-str": "error",
+    "no-multiple-empty-lines": "error",
+    "no-new-func": "error",
+    "no-new-object": "error",
+    "no-new-wrappers": "error",
+    "no-octal-escape": "error",
+    "no-param-reassign": "error",
+    "no-proto": "error",
+    "no-redeclare": "error",
+    "no-return-await": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-shadow": ["error", { "allow": ["html"] }],
+    "no-tabs": "error",
+    "no-trailing-spaces": "error",
+    "no-multi-spaces" : "error",
+    "no-undef": "error",
+    "no-undef-init": "error",
+    "no-unmodified-loop-condition": "error",
+    "no-unneeded-ternary": ["error", { defaultAssignment: false }],
+    "no-unreachable-loop": "error",
+    "no-unused-vars": ["error"],
+    "no-use-before-define": ["error", "nofunc"],
+    "no-useless-backreference": "error",
+    "no-useless-call": "error",
+    "no-useless-computed-key": "error",
+    "no-useless-constructor": "error",
+    "no-useless-escape": "error",
+    "no-useless-rename": "error",
+    "no-useless-return": "error",
+    "no-var": "error",
+    "object-curly-spacing": [ 'error', 'always' ],
+    "object-shorthand": "error",
+    "prefer-arrow-callback": "error",
+    "prefer-const": "error",
+    "prefer-exponentiation-operator": "error",
+    "prefer-numeric-literals": "error",
+    "prefer-object-spread": "error",
+    "prefer-regex-literals": "error",
+    "prefer-rest-params": "error",
+    "prefer-spread": "error",
+    "require-atomic-updates": "error",
+    "semi": ["error", "always"],
+    "space-infix-ops": "error",
+    "space-before-blocks": "error",
+    "strict": "error",
+    "yoda": ["error", "never", { onlyEquality: true }],
+  }
+};
diff --git a/...t/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java b/...t/tool/src/java/org/sakaiproject/assignment/entityproviders/AssignmentEntityProvider.java
@@ -666,7 +666,6 @@ private Map<String, Object> submissionToMap(Set<String> activeSubmitters, Assign
         Map<String, Object> submission = new HashMap<>();
 
         submission.put("id", as.getId());
-        submission.put("assignmentCloseTime", simpleAssignment.getCloseTime());
         submission.put("hydrated", hydrate);
 
         if (as.getUserSubmission()) submission.put("submitted", as.getUserSubmission());
@@ -937,6 +936,8 @@ public ActionReturn getFullSubmissions(EntityView view , Map<String, Object> par
 
         Map<String, Object> data  = new HashMap<>();
 
+        data.put("assignmentCloseTime", assignment.getCloseDate());
+
         data.put("groups", assignmentService.getGroupsAllowGradeAssignment(assignmentReference)
             .stream().map(SimpleGroup::new).collect(Collectors.toList()));
 
@@ -1229,7 +1230,8 @@ public ActionReturn setGrade(Map<String, Object> params) {
         if (submission != null) {
             boolean anonymousGrading = assignmentService.assignmentUsesAnonymousGrading(assignment);
             try {
-                return new ActionReturn(submissionToMap(activeSubmitters, assignment, new SimpleAssignment(assignment),  submission, true));
+                return new ActionReturn(Map.of("assignmentCloseTime", assignment.getCloseDate(),
+                                                "submission", submissionToMap(activeSubmitters, assignment, new SimpleAssignment(assignment),  submission, true)));
             } catch (Exception e) {
                 throw new EntityException("Failed to set grade on " + submissionId, "", HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             }

diff --git a/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java b/assignment/tool/src/java/org/sakaiproject/assignment/tool/AssignmentAction.java
@@ -1317,7 +1317,6 @@ public String buildMainPanelContext(VelocityPortlet portlet, Context context, Ru
         context.put("dateFormat", getDateFormatString());
         context.put("cheffeedbackhelper", this);
         context.put("service", assignmentService);
-        context.put("rubricsService", rubricsService);
 
         String contextString = (String) state.getAttribute(STATE_CONTEXT_STRING);
 

diff --git a/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm b/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm
@@ -600,7 +600,6 @@
 	#end
 #end
 #macro( rubricsRequirements )
-    #javascript("/webcomponents/rubrics/sakai-rubrics-utils.js")
-    #module("/webcomponents/rubrics/rubric-association-requirements.js")
+    #javascript("/webcomponents/bundles/rubric-association-requirements.js")
 #end
 <!-- end: assignment_macros.vm -->
diff --git a/...ool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm b/...ool/src/webapp/vm/assignment/chef_assignments_instructor_grading_submission_withgrader.vm
@@ -1,7 +1,7 @@
 <!-- start: chef_assignments_instructor_grading_submission_withgrader.vm  -->
 
 <!-- GRADER JAVASCRIPT -->
-#module("/webcomponents/grader/sakai-grader.js")
+#javascript("/webcomponents/bundles/grader.js")
 <script>
   ASN.currentGradingSubmission = "$formattedText.escapeUrl( $!submissionReference )";
 </script>

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_list_submissions.vm
@@ -3,8 +3,7 @@
 #set( $H = '-' )
 #set( $T = 'T' )
 <script>includeLatestJQuery('assignments');</script>
-#module("/webcomponents/grader/grader-toggle.js")
-#module("/webcomponents/sakai-user-photo.js")
+#javascript("/webcomponents/bundles/assignments.js")
 
 <script>
 function printView(url) {
@@ -35,7 +34,7 @@ function printView(url) {
 			</h1>
 		</div>
 		<div>
-			<grader-toggle #if(!$useGraderByDefault)unchecked-by-default#end tool="assignments"></grader-toggle>
+			<sakai-grader-toggle #if(!$useGraderByDefault)unchecked-by-default#end tool="assignments"></sakai-grader-toggle>
 		</div>
 	</div>
 

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_new_edit_assignment.vm
@@ -181,7 +181,7 @@
 		</div>
 
 		<div class="longtext form-group row form-required">
-			<label for="new_assignment_instructions" class="block form-control-label col-sm-12">
+			<label for="$name_Description" class="block form-control-label col-sm-12">
 				$tlang.getString("gen.assinf")
 			</label>
 			<div class="col-sm-12">

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_instructor_report_submissions.vm
@@ -1,5 +1,4 @@
 <!-- start: chef_assignments_instructor_report_submissions.vm  -->
-#module("/webcomponents/sakai-user-photo.js")
 <div class="portletBody sakai-asn-grade-report">
 	#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )
 

diff --git a/...ent/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm b/...ent/tool/src/webapp/vm/assignment/chef_assignments_instructor_student_list_submissions.vm
@@ -1,5 +1,4 @@
 <!-- start: chef_assignments_instructor_student_list_submissions.vm  -->
-#module("/webcomponents/sakai-user-photo.js")
 <div class="portletBody container-fluid">
 	#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )
 	<div class="page-header">

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_list_assignments.vm
@@ -39,6 +39,7 @@
 </script>
 
 <div class="portletBody container-fluid">
+
 	#if ($allowAddAssignment || ($withGrade && $!allowGradeSubmission))
 		## for user who cannot create assignment nor grade submission, no need to show "Assignment List" link at all since there is really no other toolbar choices
 		#navBarHREF( $allowAddAssignment $withGrade $allowGradeSubmission $allowAddAssignment $allowRecoverAssignment $allowAllGroups $assignmentscheck $allowUpdateSite $enableViewOption $view "" )

diff --git a/assignment/tool/src/webapp/vm/assignment/instructor_new_edit/grading_section.vm b/assignment/tool/src/webapp/vm/assignment/instructor_new_edit/grading_section.vm
@@ -58,22 +58,19 @@ This section contains the options for grading this assignment, including rubrics
                 dont-associate-value="0"
                 associate-label="$tlang.getString("associate.label")"
                 associate-value="1"
+                tool-id="sakai.assignment.grades"
                 #if("$!rubric_association" != "")
                     association='$rubric_association'
-                #else
-                    #if("$!assignment.Id" != "")
-                        entity-id="$assignment.Id"
-                    #end
-                    tool-id="sakai.assignment.grades"
+                #elseif("$!assignment.Id" != "")
+                    entity-id="$assignment.Id"
                 #end
                 fine-tune-points="$tlang.getString("option.pointsoverride")"
                 hide-student-preview="$tlang.getString("option.studentpreview")"
                 student-self-report="$tlang.getString("option.selfreport")"
                 student-self-report-mode-0="$tlang.getString("option.selfreport.must")"
                 student-self-report-mode-1="$tlang.getString("option.selfreport.partialmust")"
                 student-self-report-mode-2="$tlang.getString("option.selfreport.notamust")"
-                show-self-report-check="true"
-            >
+                show-self-report-check="true">
             </sakai-rubric-association>
         </div>
 

diff --git a/basiclti/web-ifp/src/bundle/vm/main.vm b/basiclti/web-ifp/src/bundle/vm/main.vm
@@ -1,22 +1,19 @@
 <div class="portletBody">
+<script src="/webcomponents/bundles/lti.js"></script>
 #if ($alertMessage)<div class="sak-banner-error">$tlang.getString("gen.alert") $alertMessage</div>#end
 ## See also assignment/tool/src/webapp/vm/assignment/chef_assignments_view_launch.vm
 #if ($!newpage)
-<script type="module" src="/webcomponents/sakai-lti-popup.js"></script>
 <p>
-<sakai-lti-popup
-  launch-url="$!source"
-/>
+<sakai-lti-popup launch-url="$!source"></sakai-lti-popup>
 </p>
 #else
-<script type="module" src="/webcomponents/sakai-lti-iframe.js"></script>
 <p>
 <sakai-lti-iframe
   allow-resize="yes"
   launch-url="$!source"
   height="$!height"
-  allow="$!browser-feature-allow"
-/>
+  allow="$!browser-feature-allow">
+</sakai-lti-iframe>
 </p>
 #end
 </div>
diff --git a/chat/chat-tool/tool/src/webapp/jsp/room.jsp b/chat/chat-tool/tool/src/webapp/jsp/room.jsp
@@ -2,7 +2,6 @@
     <sakai:view title="#{msgs['custom.chatroom']}">
         <h:outputText value="#{Portal.latestJQuery}" escape="false"/>
         <script src='/sakai-chat-tool/js/chatscript.js<h:outputText value="#{Portal.CDNQuery}" />'></script>
-        <script type="module" src='/webcomponents/sakai-user-photo.js<h:outputText value="#{Portal.CDNQuery}" />'></script>
         <script>
             if ( window.frameElement) window.frameElement.className='wcwmenu';
             $(document).ready( function () {

diff --git a/commons/tool/src/webapp/WEB-INF/bootstrap.jsp b/commons/tool/src/webapp/WEB-INF/bootstrap.jsp
@@ -34,7 +34,6 @@
         <script src="/commons-tool/js/commons_utils.js${portalCDNQuery}"></script>
         <script src="/commons-tool/js/commons_permissions.js${portalCDNQuery}"></script>
         <script src="/profile2-tool/javascript/profile2-eb.js${portalCDNQuery}"></script>
-        <script type="module" src="/webcomponents/sakai-user-photo.js${portalCDNQuery}"></script>
 
         <div id="Mrphs-sakai-commons" class="portletBody commons-portletBody">
 

diff --git a/commons/tool/src/webapp/js/commons.js b/commons/tool/src/webapp/js/commons.js
@@ -374,14 +374,11 @@ commons.switchState = function (state, arg) {
 
     $(document).ready(function () {
 
-      import("/webcomponents/sakai-i18n.js").then(m => {
+      loadProperties({bundle: 'commons'}).then(i18n => {
 
-        m.loadProperties({bundle: 'commons'}).then(i18n => {
-
-          commons.i18n = i18n;
-          commonsHelpers["tr"] =  (key, options) => new Handlebars.SafeString(m.tr("commons", key, options.hash));
-          languagesLoaded();
-        });
+        commons.i18n = i18n;
+        commonsHelpers["tr"] =  (key, options) => new Handlebars.SafeString(tr("commons", key, options.hash));
+        languagesLoaded();
       });
     });
 

diff --git a/conversations/tool/src/main/webapp/WEB-INF/templates/bootstrap.html b/conversations/tool/src/main/webapp/WEB-INF/templates/bootstrap.html
@@ -3,10 +3,10 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link media="all" href="/library/skin/tool_base.css" rel="stylesheet" type="text/css" />
-    <script type="module" th:src="@{~/webcomponents/conversations/sakai-conversations.js} + ${cdnQuery}"></script>
     [(${sakaiHtmlHead})]
   </head>
   <body onload="setMainFrameHeight('Mainmercuryx710');setFocus(focus_path);"   class="Mrphs-container Mrphs-sakai-dropbox">
+    <script th:src="@{~/webcomponents/bundles/conversations.js} + ${cdnQuery}"></script>
     <script>includeLatestJQuery('conversations');</script>
     <div class="portletBody">
         <!--sakai-conversations th:topic-id="${topicId}" th:site-id="${siteId}" th:state="${state}" th:base-url="${baseUrl}"></sakai-conversations-->

diff --git a/dashboard/tool/src/main/webapp/WEB-INF/templates/course_dashboard.html b/dashboard/tool/src/main/webapp/WEB-INF/templates/course_dashboard.html
@@ -7,10 +7,10 @@
         <script src="/library/js/headscripts.js"></script>
         <script>includeWebjarLibrary('ckeditor');</script>
         <script src="/library/editor/ckeditor.launch.js"></script>
-        <script type="module" th:src="@{~/webcomponents/coursedashboard/sakai-course-dashboard.js} + ${cdnQuery}"></script>
         [(${sakaiHtmlHead})]
     </head>
     <body>
+        <script th:src="@{~/webcomponents/bundles/dashboards.js} + ${cdnQuery}"></script>
         <div class="portletBody">
             <sakai-course-dashboard th:site-id="${siteId}" th:user-id="${userId}"></sakai-course-dashboard>
         </div>

diff --git a/dashboard/tool/src/main/webapp/WEB-INF/templates/home_dashboard.html b/dashboard/tool/src/main/webapp/WEB-INF/templates/home_dashboard.html
@@ -6,9 +6,9 @@
         <link media="all" href="/library/skin/tool_base.css" rel="stylesheet" type="text/css" />
         <script src="/library/js/headscripts.js"></script>
         <script>includeWebjarLibrary('ckeditor');</script>
-        <script type="module" th:src="@{~/webcomponents/sakai-home-dashboard.js} + ${cdnQuery}"></script>
     </head>
     <body>
+        <script th:src="@{~/webcomponents/bundles/dashboards.js} + ${cdnQuery}"></script>
         <div class="portletBody">
             <sakai-home-dashboard th:user-id="${userId}"></sakai-home-dashboard>
         </div>

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.html
@@ -1,7 +1,6 @@
 <html>
     <wicket:panel xmlns:wicket="http://wicket.apache.org">
         <script wicket:id="messagerScript"></script>
-        <script wicket:id="userPhotoScript"></script>
         <div id="gradeTableWrapper">
             <div wicket:id="gradeTable" id="gradeTable" accesskey="g" wicket:message="aria-label:gradetable.wrapper.tooltip" aria-describedby="gradeTableCaption"></div>
         </div>

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java
@@ -82,15 +82,9 @@ public GbGradeTable(final String id, final IModel model) {
 		final String version = PortalUtils.getCDNQuery();
 
 		Label messagerLabel = new Label("messagerScript", "");
-		messagerLabel.add(new AttributeAppender("type", "module"));
-		messagerLabel.add(new AttributeAppender("src", String.format("/webcomponents/sakai-submission-messager.js%s", version)));
+		messagerLabel.add(new AttributeAppender("src", String.format("/webcomponents/bundles/gradebook.js%s", version)));
 		add(messagerLabel);
 
-		Label photoScriptLabel = new Label("userPhotoScript", "");
-		photoScriptLabel.add(new AttributeAppender("type", "module"));
-		photoScriptLabel.add(new AttributeAppender("src", String.format("/webcomponents/sakai-user-photo.js%s", version)));
-		add(photoScriptLabel);
-
 		component = new WebMarkupContainer("gradeTable").setOutputMarkupId(true);
 
 		component.add(new AjaxEventBehavior("gbgradetable.action") {

diff --git a/...ool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java b/...ool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java
@@ -379,8 +379,6 @@ public void renderHead(final IHeaderResponse response) {
 
 		final String version = PortalUtils.getCDNQuery();
 		response.render(StringHeaderItem.forString(
-			"<script src=\"/webcomponents/rubrics/sakai-rubrics-utils.js" + version + "\"></script>"));
-		response.render(StringHeaderItem.forString(
-			"<script type=\"module\" src=\"/webcomponents/rubrics/rubric-association-requirements.js" + version + "\"></script>"));
+			"<script src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
 	}
 }
diff --git a/...bookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java b/...bookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
@@ -529,9 +529,7 @@ public void renderHead(final IHeaderResponse response) {
 
 		final String version = PortalUtils.getCDNQuery();
 		response.render(StringHeaderItem.forString(
-			"<script src=\"/webcomponents/rubrics/sakai-rubrics-utils.js" + version + "\"></script>"));
-		response.render(StringHeaderItem.forString(
-			"<script type=\"module\" src=\"/webcomponents/rubrics/rubric-association-requirements.js" + version + "\"></script>"));
+			"<script src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
 	}
 
 	private Component newPopoverFlag(String id, String msg, boolean visible) {

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
@@ -143,8 +143,6 @@ public void renderHead(final IHeaderResponse response) {
 
 		final String version = PortalUtils.getCDNQuery();
 		response.render(StringHeaderItem.forString(
-			"<script src=\"/webcomponents/rubrics/sakai-rubrics-utils.js" + version + "\"></script>"));
-		response.render(StringHeaderItem.forString(
-			"<script type=\"module\" src=\"/webcomponents/rubrics/rubric-association-requirements.js" + version + "\"></script>"));
+			"<script src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
     }
 }
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricPreviewPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricPreviewPanel.java
@@ -87,9 +87,7 @@ public void renderHead(IHeaderResponse response) {
 
         String version = PortalUtils.getCDNQuery();
         response.render(StringHeaderItem.forString(
-                "<script src=\"/webcomponents/rubrics/sakai-rubrics-utils.js" + version + "\"></script>"));
-        response.render(StringHeaderItem.forString(
-                "<script type=\"module\" src=\"/webcomponents/rubrics/rubric-association-requirements.js" + version + "\"></script>"));
+                "<script src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
     }
 
     private String extractAssignmentId(String externalId) {