Refactor new get form methond in forms service to be promise based an…

…d fix all references
redbox-mint · Jun 27, 2024 · 88812dc · 88812dc
1 parent 8e31a5f
commit 88812dc
Show file tree

Hide file tree

Showing 5 changed files with 208 additions and 230 deletions.
diff --git a/test/unit/services/FormsService.test.js b/test/unit/services/FormsService.test.js
@@ -40,7 +40,7 @@ describe('The FormsService', function () {
         type: 'rdmp'
       }
     };
-    FormsService.getForm(brand, '', true, '', record).subscribe(form => {
+    FormsService.getForm(brand, '', true, '', record).then(form => {
       expect(form).to.have.property('name', formName);
       done();
     })
@@ -55,7 +55,7 @@ describe('The FormsService', function () {
         type: 'rdmp'
       }
     };
-    FormsService.getForm(brand, '', true, '', record).subscribe(form => {
+    FormsService.getForm(brand, '', true, '', record).then(form => {
       expect(form).to.have.property('name', formName);
       done();
     })
@@ -64,7 +64,7 @@ describe('The FormsService', function () {
   it('should return the form', function (done) {
     let brand = BrandingService.getDefault();
     let formName = 'default-1.0-draft';
-    FormsService.getForm(brand, formName, true, 'rdmp', {}).subscribe(form => {
+    FormsService.getForm(brand, formName, true, 'rdmp', {}).then(form => {
       expect(form).to.have.property('name', formName);
       done();
     })
@@ -73,7 +73,7 @@ describe('The FormsService', function () {
   it('should return the autogenerated form', function (done) {
     let brand = BrandingService.getDefault();
     let formName = 'generated-view-only';
-    FormsService.getForm(brand, formName, true, 'rdmp', {}).subscribe(form => {
+    FormsService.getForm(brand, formName, true, 'rdmp', {}).then(form => {
       expect(form).to.have.property('name', formName);
       done();
     })

diff --git a/typescript/api/controllers/RecordController.ts b/typescript/api/controllers/RecordController.ts
@@ -261,7 +261,7 @@ export module Controllers {
             if (!hasEditAccess) {
               return this.ajaxFail(req, res, null, {message: TranslationService.t('edit-error-no-permissions')});
             }
-            form = await FormsService.getForm(brand, formParam, editMode, '', currentRec).toPromise();
+            form = await FormsService.getForm(brand, formParam, editMode, '', currentRec);
             if (_.isEmpty(form)) {
               return this.ajaxFail(req, res, null, {message: `Error, getting form ${formParam} for OID: ${oid}`});
             }
@@ -271,7 +271,7 @@ export module Controllers {
             if (!hasViewAccess) {
               return this.ajaxFail(req, res, null, {message: TranslationService.t('view-error-no-permissions')});
             }
-            form = await FormsService.getForm(brand, formParam, editMode, '', currentRec).toPromise();
+            form = await FormsService.getForm(brand, formParam, editMode, '', currentRec);
             if (_.isEmpty(form)) {
               return this.ajaxFail(req, res, null, {message: `Error, getting form ${formParam} for OID: ${oid}`});
             }

diff --git a/typescript/api/controllers/webservice/RecordController.ts b/typescript/api/controllers/webservice/RecordController.ts
@@ -1085,7 +1085,7 @@ export module Controllers {
       let keys = _.keys(meta1);
 
       for(let key of keys) {
-        if(_.get(meta1,key,'') != _.get(meta2,key,'')) {
+        if(!_.isEqual(meta1?.[key],meta2?.[key])) {
           return false;
         }
       }