Merge branch 'develop' of https://github.com/ngageoint/mage-server into 6.5.1-beta

Author: ryanslatten

package-lock.json

@@ -51,7 +51,7 @@
     "fs-extra": "4.0.3",
     "geojson": "0.5.0",
     "geojson-validation": "1.0.2",
-    "json2csv": "4.5.4",
+    "json2csv": "5.0.7",
     "jsonwebtoken": "9.0.2",
     "lodash": "4.17.21",
     "mgrs": "1.0.0",
@@ -93,7 +93,7 @@
     "@types/express": "4.17.21",
     "@types/express-serve-static-core": "4.19.6",
     "@types/fs-extra": "8.1.5",
-    "@types/json2csv": "4.5.1",
+    "@types/json2csv": "5.0.7",
     "@types/lodash": "4.17.16",
     "@types/mocha": "7.0.2",
     "@types/multer": "1.4.12",

service/npm-shrinkwrap.json

@@ -11,21 +11,21 @@ export class AdminEventFormPreviewComponent implements OnChanges {
   @Input() formDefinition: any[];
   @Output() onClose = new EventEmitter<void>();
 
-  constructor(public dialog: MatDialog) {}
+  constructor(public dialog: MatDialog) { }
 
-  ngOnChanges(changes: SimpleChanges): void {
+  ngOnChanges(): void {
     if (this.formDefinition) {
       this.openDialog()
     }
   }
 
   openDialog(): void {
     const dialog = this.dialog.open(AdminEventFormPreviewDialogComponent, {
-      data:  this.formDefinition,
-      minWidth: 400,
-      autoFocus: false
+      data: this.formDefinition,
+      width: '600px',
+      maxWidth: '90vw'
     })
-    
+
     dialog.afterClosed().subscribe(() => {
       this.onClose.emit();
     });

service/package.json

@@ -0,0 +1,29 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ReactiveFormsModule, FormsModule } from '@angular/forms';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+
+import { AdminEventFormPreviewComponent } from './admin-event-form-preview/admin-event-form-preview.component';
+import { AdminEventFormPreviewDialogComponent } from './admin-event-form-preview/admin-event-form-preview-dialog.component';
+import { ObservationModule } from '../../../observation/observation.module';
+
+@NgModule({
+    declarations: [
+        AdminEventFormPreviewComponent,
+        AdminEventFormPreviewDialogComponent
+    ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        MatDialogModule,
+        MatButtonModule,
+        ObservationModule
+    ],
+    exports: [
+        AdminEventFormPreviewComponent,
+        AdminEventFormPreviewDialogComponent
+    ]
+})
+export class AdminEventFormModule { }

web-app/admin/src/app/admin/admin-event/admin-event-form/admin-event-form-preview/admin-event-form-preview.component.ts

@@ -0,0 +1,83 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatChipsModule } from '@angular/material/chips';
+import { MatTableModule } from '@angular/material/table';
+import { MatPaginatorModule } from '@angular/material/paginator';
+import { MatSortModule } from '@angular/material/sort';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatDividerModule } from '@angular/material/divider';
+import { MatSelectModule } from '@angular/material/select';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { DragDropModule } from '@angular/cdk/drag-drop';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatIconModule } from '@angular/material/icon';
+import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
+
+import { CoreModule } from '../../core/core.module';
+import { AdminBreadcrumbModule } from '../admin-breadcrumb/admin-breadcrumb.module';
+import { AdminEventFormModule } from './admin-event-form/admin-event-form.module';
+
+import { EventDetailsComponent } from './event-details/event-details.component';
+import { DeleteEventComponent } from './delete-event/delete-event.component';
+import { CreateFormDialogComponent } from './create-form/create-form.component';
+import { EventDashboardComponent } from './dashboard/event-dashboard.component';
+import { MatOptionModule } from '@angular/material/core';
+import { EventService } from 'src/app/event/event.service';
+import { CreateEventDialogComponent } from './create-event/create-event.component';
+
+@NgModule({
+    declarations: [
+        EventDashboardComponent,
+        CreateEventDialogComponent,
+        EventDetailsComponent,
+        DeleteEventComponent,
+        CreateFormDialogComponent
+    ],
+    imports: [
+        CommonModule,
+        FormsModule,
+        CoreModule,
+        ReactiveFormsModule,
+        RouterModule,
+        CoreModule,
+        AdminBreadcrumbModule,
+        AdminEventFormModule,
+        MatButtonModule,
+        MatCardModule,
+        MatChipsModule,
+        MatTableModule,
+        MatPaginatorModule,
+        MatSortModule,
+        MatDialogModule,
+        MatFormFieldModule,
+        MatDividerModule,
+        MatIconModule,
+        MatInputModule,
+        MatButtonModule,
+        MatCheckboxModule,
+        MatIconModule,
+        MatProgressSpinnerModule,
+        AdminBreadcrumbModule,
+        MatSelectModule,
+        MatOptionModule,
+        MatTooltipModule,
+        MatTableModule,
+        MatPaginatorModule,
+        DragDropModule
+    ],
+    exports: [
+        EventDashboardComponent,
+        EventDetailsComponent
+    ],
+    providers: [
+        EventService
+    ]
+})
+export class AdminEventsModule { }