Merge branch 'release-5.18.4'

Author: hirokiterashima

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wise",
-  "version": "5.18.3",
+  "version": "5.18.4",
   "description": "Web-based Inquiry Science Environment",
   "main": "app.js",
   "browserslist": [

package.json

@@ -34,7 +34,7 @@
   <artifactId>wise</artifactId>
   <packaging>war</packaging>
   <name>Web-based Inquiry Science Environment</name>
-  <version>5.18.3</version>
+  <version>5.18.4</version>
   <url>http://wise5.org</url>
   <licenses>
     <license>

pom.xml

@@ -133,6 +133,7 @@ protected HashMap<String, Object> getConfig(HttpServletRequest request) {
     config.put("isGoogleClassroomEnabled", isGoogleClassroomEnabled());
     config.put("logOutURL", contextPath + "/logout");
     config.put("recaptchaPublicKey", appProperties.get("recaptcha_public_key"));
+    config.put("wiseHostname", appProperties.get("wise.hostname"));
     config.put("wise4Hostname", appProperties.get("wise4.hostname"));
     return config;
   }

src/main/java/org/wise/portal/presentation/web/controllers/user/UserAPIController.java

@@ -1 +1 @@
-5.18.3
+5.18.4

src/main/resources/version.txt

@@ -49,6 +49,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { MatSelectModule } from '@angular/material/select';
 import { HelpIconComponent } from '../../../wise5/themes/default/themeComponents/helpIcon/help-icon.component';
 import { NodeStatusIcon } from '../../../wise5/themes/default/themeComponents/nodeStatusIcon/node-status-icon.component';
+import { MomentModule } from 'ngx-moment';
 
 @Component({template: ``})
 export class EmptyComponent {}
@@ -75,6 +76,7 @@ export class EmptyComponent {}
     MatListModule,
     MatSelectModule,
     MatTooltipModule,
+    MomentModule,
     ReactiveFormsModule,
     RouterModule.forChild([
       {path: '**', component: EmptyComponent}
@@ -127,6 +129,7 @@ export class EmptyComponent {}
     MatListModule,
     MatSelectModule,
     MatTooltipModule,
+    MomentModule,
     NodeIconComponent,
     ReactiveFormsModule
   ]

src/main/webapp/site/src/app/common-hybrid-angular.module.ts

@@ -6,5 +6,6 @@ export class Config {
   recaptchaPublicKey?: string;
   logOutURL: string;
   currentTime: number;
+  wiseHostname?: string;
   wise4Hostname?: string;
 }

src/main/webapp/site/src/app/domain/config.ts

@@ -115,7 +115,3 @@
     margin-left: -16%;
   }
 }
-
-.mat-divider {
-  margin: 16px 0;
-}

src/main/webapp/site/src/app/features/features.component.scss

@@ -1,17 +1,18 @@
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { LibraryProjectDetailsComponent } from "../library-project-details/library-project-details.component";
 import { MatDialog, MatDialogRef, MAT_DIALOG_DATA} from '@angular/material/dialog';
 import { finalize } from 'rxjs/operators';
 import { LibraryProject } from "../libraryProject";
 import { LibraryService } from "../../../services/library.service";
 import { MatSnackBar } from '@angular/material/snack-bar';
+import { Subscription } from 'rxjs';
 
 @Component({
   selector: 'app-copy-project-dialog',
   templateUrl: './copy-project-dialog.component.html',
   styleUrls: ['./copy-project-dialog.component.scss']
 })
-export class CopyProjectDialogComponent implements OnInit {
+export class CopyProjectDialogComponent {
 
   isCopying: boolean = false;
 
@@ -20,15 +21,11 @@ export class CopyProjectDialogComponent implements OnInit {
               @Inject(MAT_DIALOG_DATA) public data: any,
               private libraryService: LibraryService,
               private snackBar: MatSnackBar) {
-
     this.libraryService.newProjectSource$.subscribe(() => {
       this.dialog.closeAll();
     });
   }
 
-  ngOnInit() {
-  }
-
   copy() {
     this.isCopying = true;
     this.libraryService.copyProject(this.data.project.id)

src/main/webapp/site/src/app/modules/library/copy-project-dialog/copy-project-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { Project } from '../../../domain/project';
 import { TeacherService } from '../../../teacher/teacher.service';
@@ -13,7 +13,7 @@ import { EditRunWarningDialogComponent } from '../../../teacher/edit-run-warning
   templateUrl: './library-project-menu.component.html',
   styleUrls: ['./library-project-menu.component.scss']
 })
-export class LibraryProjectMenuComponent implements OnInit {
+export class LibraryProjectMenuComponent {
   @Input()
   project: Project;
 
@@ -27,10 +27,10 @@ export class LibraryProjectMenuComponent implements OnInit {
   isChild: boolean = false;
 
   constructor(
-    public dialog: MatDialog,
-    public teacherService: TeacherService,
-    public userService: UserService,
-    public configService: ConfigService
+    private dialog: MatDialog,
+    private teacherService: TeacherService,
+    private userService: UserService,
+    private configService: ConfigService
   ) {}
 
   ngOnInit() {
@@ -59,10 +59,7 @@ export class LibraryProjectMenuComponent implements OnInit {
   }
 
   copyProject() {
-    this.dialog.open(CopyProjectDialogComponent, {
-      data: { project: this.project },
-      panelClass: 'mat-dialog--sm'
-    });
+    this.teacherService.copyProject(this.project, this.dialog);
   }
 
   editProject() {