merge master

brendanbond · brendanbond · commit e1ffb5b7da9a · 2025-07-07T10:55:38.000-05:00
diff --git a/projects/angular-formio/manager/src/submission/submission/submission.component.ts b/projects/angular-formio/manager/src/submission/submission/submission.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { FormManagerService } from '../../form-manager.service';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
+import { NgIf } from '@angular/common';
 
 @Component({
   templateUrl: './submission.component.html',
-  standalone: false
+  imports: [NgIf, RouterLink, RouterLinkActive, RouterOutlet]
 })
 export class SubmissionComponent implements OnInit {
   public downloadUrl: string;
diff --git a/projects/angular-formio/manager/src/submission/view/view.component.ts b/projects/angular-formio/manager/src/submission/view/view.component.ts
@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
 import { FormManagerService } from '../../form-manager.service';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './view.component.html',
-  standalone: false
+  imports: [FormioComponent]
 })
 export class SubmissionViewComponent {
   constructor(public service: FormManagerService) { }
diff --git a/projects/angular-formio/manager/src/view/view.component.ts b/projects/angular-formio/manager/src/view/view.component.ts
@@ -4,10 +4,12 @@ import { FormManagerService } from '../form-manager.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { FormioAuthService } from '@formio/angular/auth';
 import { Formio } from '@formio/js';
+import { NgIf } from '@angular/common';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './view.component.html',
-  standalone: false
+  imports: [NgIf, FormioComponent]
 })
 export class FormManagerViewComponent implements OnInit {
   public submission: any;
diff --git a/projects/angular-formio/resource/src/create/create.component.ts b/projects/angular-formio/resource/src/create/create.component.ts
@@ -1,12 +1,14 @@
 import { Component, EventEmitter, OnInit } from '@angular/core';
-import { Router, ActivatedRoute } from '@angular/router';
+import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
+import { NgIf } from '@angular/common';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   styleUrls: ['./create.component.scss'],
   templateUrl: './create.component.html',
-  standalone: false
+    imports: [NgIf, RouterLink, FormioComponent]
 })
 export class FormioResourceCreateComponent implements OnInit {
   public onError: EventEmitter<any>;
diff --git a/projects/angular-formio/resource/src/delete/delete.component.ts b/projects/angular-formio/resource/src/delete/delete.component.ts
@@ -2,10 +2,7 @@ import { Component } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 
-@Component({
-  templateUrl: './delete.component.html',
-  standalone: false
-})
+@Component({ templateUrl: './delete.component.html' })
 export class FormioResourceDeleteComponent {
   constructor(
     public service: FormioResourceService,
diff --git a/projects/angular-formio/resource/src/edit/edit.component.ts b/projects/angular-formio/resource/src/edit/edit.component.ts
@@ -3,10 +3,11 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
 import { Formio } from '@formio/js';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './edit.component.html',
-  standalone: false
+    imports: [FormioComponent]
 })
 export class FormioResourceEditComponent implements OnDestroy {
   public triggerError: EventEmitter<any> = new EventEmitter();
diff --git a/projects/angular-formio/resource/src/index/index.component.ts b/projects/angular-formio/resource/src/index/index.component.ts
@@ -3,10 +3,12 @@ import { Router, ActivatedRoute } from '@angular/router';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
 import { each } from 'lodash';
+import { FormioAlertsComponent } from '@formio/angular';
+import { FormioGridComponent } from '@formio/angular/grid';
 
 @Component({
   templateUrl: './index.component.html',
-  standalone: false
+    imports: [FormioAlertsComponent, FormioGridComponent]
 })
 export class FormioResourceIndexComponent implements OnInit {
   public gridSrc?: string;
diff --git a/projects/angular-formio/resource/src/resource.component.ts b/projects/angular-formio/resource/src/resource.component.ts
@@ -1,12 +1,13 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, Router, RouterEvent } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Router, RouterEvent, RouterLink, RouterLinkActive, RouterOutlet } from '@angular/router';
 import { FormioAuthService } from '@formio/angular/auth';
 import { FormioResourceService } from './resource.service';
 import { Subscription } from 'rxjs';
+import { NgIf } from '@angular/common';
 
 @Component({
   templateUrl: './resource.component.html',
-  standalone: false
+    imports: [RouterLink, RouterLinkActive, NgIf, RouterOutlet]
 })
 export class FormioResourceComponent implements OnInit, OnDestroy {
   public perms = {delete: false, edit: false};
diff --git a/projects/angular-formio/resource/src/resource.module.ts b/projects/angular-formio/resource/src/resource.module.ts
@@ -19,9 +19,7 @@ import { extendRouter } from '@formio/angular';
     CommonModule,
     FormioModule,
     FormioGrid,
-    RouterModule
-  ],
-  declarations: [
+        RouterModule,
     FormioResourceComponent,
     FormioResourceCreateComponent,
     FormioResourceIndexComponent,
diff --git a/projects/angular-formio/resource/src/view/view.component.ts b/projects/angular-formio/resource/src/view/view.component.ts
@@ -2,10 +2,11 @@ import {Component, OnDestroy} from '@angular/core';
 import { FormioResourceService } from '../resource.service';
 import { FormioResourceConfig } from '../resource.config';
 import {Formio} from '@formio/js';
+import { FormioComponent } from '@formio/angular';
 
 @Component({
   templateUrl: './view.component.html',
-  standalone: false
+    imports: [FormioComponent]
 })
 export class FormioResourceViewComponent implements OnDestroy{
   constructor(
diff --git a/projects/angular-formio/src/FormioBaseComponent.ts b/projects/angular-formio/src/FormioBaseComponent.ts
@@ -9,10 +9,7 @@ import {Form, Utils, Webform} from '@formio/js';
 import { AlertsPosition } from './types/alerts-position';
 const { Evaluator, fastCloneDeep } = Utils;
 
-@Component({
-  template: '',
-  standalone: false
-})
+@Component({ template: '' })
 export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   @Input() form?: FormioForm;
   @Input() submission?: any = {};
@@ -289,29 +286,38 @@ export class FormioBaseComponent implements OnInit, OnChanges, OnDestroy {
   }
 
   setFormFromSrc() {
-    this.service.loadForm({ params: { live: 1 } }).subscribe(
-      (form: FormioForm) => {
-        if (form && form.components) {
-          this.ngZone.runOutsideAngular(() => {
-            this.setForm(form);
-          });
-        }
-
-        // if a submission is also provided.
+     // if a submission is provided, load it first to set required form revision.
         if (
           isEmpty(this.submission) &&
           this.service &&
           this.service.formio.submissionId
         ) {
           this.service.loadSubmission().subscribe(
             (submission: any) => {
+           this.loadForm(() => {
               if (this.readOnly) {
                 this.formio.options.readOnly = true;
               }
               this.submission = this.formio.submission = submission;
+           });
             },
             err => this.onError(err)
           );
+     } else {
+       this.loadForm();
+     }
+  }
+
+  loadForm(done?: () => void) {
+    this.service.loadForm({ params: { live: 1 } }).subscribe(
+      (form: FormioForm) => {
+        if (form && form.components) {
+          this.ngZone.runOutsideAngular(() => {
+            this.setForm(form);
+          });
+        }
+        if (done) {
+          done();
         }
       },
       err => this.onError(err)
diff --git a/projects/angular-formio/src/components/alerts/formio.alerts.component.ts b/projects/angular-formio/src/components/alerts/formio.alerts.component.ts
@@ -1,10 +1,12 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import { FormioAlerts } from './formio.alerts';
+import { NgFor } from '@angular/common';
+import { ParseHtmlContentPipe } from './parse-html-content.pipe';
 
 @Component({
   selector: 'formio-alerts',
   templateUrl: './formio.alerts.component.html',
-  standalone: false
+    imports: [NgFor, ParseHtmlContentPipe]
 })
 export class FormioAlertsComponent implements OnInit {
   @Input() alerts: FormioAlerts;
diff --git a/projects/angular-formio/src/components/alerts/parse-html-content.pipe.ts b/projects/angular-formio/src/components/alerts/parse-html-content.pipe.ts
@@ -1,6 +1,8 @@
 import { Pipe, PipeTransform } from '@angular/core';
 
-@Pipe({ name: 'parseHtmlContent', pure: false, standalone: false })
+@Pipe({
+    name: 'parseHtmlContent', pure: false
+})
 export class ParseHtmlContentPipe implements PipeTransform {
 
   /*
diff --git a/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts b/projects/angular-formio/src/components/formbuilder/formbuilder.component.ts
@@ -27,8 +27,7 @@ import { CustomTagsService } from '../../custom-tags.service';
   selector: 'form-builder',
   templateUrl: './formbuilder.component.html',
   styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.builder.min.css'],
-  encapsulation: ViewEncapsulation.None,
-  standalone: false
+    encapsulation: ViewEncapsulation.None
 })
 /* tslint:enable */
 export class FormBuilderComponent implements OnInit, OnChanges, OnDestroy {
diff --git a/projects/angular-formio/src/components/formio/formio.component.ts b/projects/angular-formio/src/components/formio/formio.component.ts
@@ -3,14 +3,17 @@ import { FormioAppConfig } from '../../formio.config';
 import { Formio, Form } from '@formio/js';
 import { FormioBaseComponent } from '../../FormioBaseComponent';
 import { CustomTagsService } from '../../custom-tags.service';
+import { NgIf } from '@angular/common';
+import { FormioLoaderComponent } from '../loader/formio.loader.component';
+import { FormioAlertsComponent } from '../alerts/formio.alerts.component';
 
 /* tslint:disable */
 @Component({
   selector: 'formio',
   templateUrl: './formio.component.html',
   styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.form.min.css'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false
+    imports: [NgIf, FormioLoaderComponent, FormioAlertsComponent]
 })
 /* tslint:enable */
 export class FormioComponent extends FormioBaseComponent implements OnInit, OnChanges {
@@ -20,6 +23,7 @@ export class FormioComponent extends FormioBaseComponent implements OnInit, OnCh
     @Optional() public customTags?: CustomTagsService,
   ) {
     super(ngZone, config, customTags);
+    alert('Hello FormioComponent');
     if (this.config) {
       Formio.setBaseUrl(this.config.apiUrl);
       Formio.setProjectUrl(this.config.appUrl);
diff --git a/projects/angular-formio/src/components/formioreport/formioreport.component.ts b/projects/angular-formio/src/components/formioreport/formioreport.component.ts
@@ -2,14 +2,17 @@ import { Component, OnInit, ViewEncapsulation, Input, OnChanges, ViewChild, Elem
 import { Formio } from '@formio/js';
 import { FormioComponent } from '../formio/formio.component';
 import { FormioReport } from '../../formio.common';
+import { NgIf } from '@angular/common';
+import { FormioLoaderComponent } from '../loader/formio.loader.component';
+import { FormioAlertsComponent } from '../alerts/formio.alerts.component';
 
 /* tslint:disable */
 @Component({
   selector: 'formio-report',
   templateUrl: './formioreport.component.html',
   styleUrls: ['../../../../../node_modules/@formio/js/dist/formio.form.min.css'],
   encapsulation: ViewEncapsulation.None,
-  standalone: false
+    imports: [NgIf, FormioLoaderComponent, FormioAlertsComponent]
 })
 /* tslint:enable */
 export class FormioReportComponent extends FormioComponent implements OnInit, OnChanges {
diff --git a/projects/angular-formio/src/components/loader/formio.loader.component.ts b/projects/angular-formio/src/components/loader/formio.loader.component.ts
@@ -1,10 +1,11 @@
 import {Component, Input} from '@angular/core';
+import { NgIf } from '@angular/common';
 
 @Component({
   selector: 'formio-loader',
   styleUrls: ['./formio.loader.component.scss'],
   templateUrl: './formio.loader.component.html',
-  standalone: false
+    imports: [NgIf]
 })
 export class FormioLoaderComponent {
   @Input() isLoading: boolean
diff --git a/projects/angular-formio/src/formio.module.ts b/projects/angular-formio/src/formio.module.ts
@@ -11,7 +11,8 @@ import { CustomTagsService } from './custom-tags.service';
 import { FormioBaseComponent } from './FormioBaseComponent';
 
 @NgModule({
-    declarations: [
+    imports: [
+        CommonModule,
         FormioComponent,
         FormioReportComponent,
         FormioBaseComponent,
@@ -20,9 +21,6 @@ import { FormioBaseComponent } from './FormioBaseComponent';
         FormioAlertsComponent,
         ParseHtmlContentPipe
     ],
-    imports: [
-        CommonModule
-    ],
     exports: [
         FormioComponent,
         FormioReportComponent,
diff --git a/yarn.lock b/yarn.lock
@@ -4443,9 +4443,9 @@ core-js@^3.37.1:
   integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
 
 core-js@^3.39.0:
-  version "3.43.0"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.43.0.tgz#f7258b156523208167df35dea0cfd6b6ecd4ee88"
-  integrity sha512-N6wEbTTZSYOY2rYAn85CuvWWkCK6QweMn7/4Nr3w+gDBeBhk/x4EJeY6FPo4QzDoJZxVTv8U7CMvgWk6pOHHqA==
+  version "3.44.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.44.0.tgz#db4fd4fa07933c1d6898c8b112a1119a9336e959"
+  integrity sha512-aFCtd4l6GvAXwVEh3XbbVqJGHDJt0OZRa+5ePGx3LLwi12WfexqQxcsohb2wgsa/92xtl19Hd66G/L+TaAxDMw==
 
 core-util-is@1.0.2:
   version "1.0.2"
