WIP

mchapman · mchapman · commit c30509b2a822 · 2024-01-14T11:28:57.000Z
diff --git a/src/client/js/controllers/model.ts b/src/client/js/controllers/model.ts
@@ -9,7 +9,7 @@ module fng.controllers {
     $http.get('/api/models').then(function (response) {
       $scope.models = response.data;
     }, function () {
-      $location.path('/404');
+      $location.search({}).path('/404');
     });
 
     $scope.newUrl = function (model) {
diff --git a/src/client/js/services/record-handler.ts b/src/client/js/services/record-handler.ts
@@ -584,7 +584,7 @@ module fng.services {
                 }
               }
               title = title.trimEnd() + (formsAngular.title.suffix || '');
-              $window.document.title = title.replace(/<\/?[^>]+(>|$)/g, "");;
+              $window.document.title = title.replace(/<\/?[^>]+(>|$)/g, "");
             }
           }
         }, true);
@@ -673,6 +673,10 @@ module fng.services {
           // want to know that an error has occurred.  This value is NOT used anywhere in forms-angular.
           $scope.phase = "error";
           $scope.showError(errorMessage);
+        } else if (response.status === 404) {
+          $location
+            .search({})
+            .path('/404');
         } else {
           let msg = response.data;
           if (typeof msg !== "string") {
@@ -745,7 +749,7 @@ module fng.services {
               $scope.dataEventFunctions.onReadError($scope.id, e);
             } else {
               if (e.status === 404) {
-                $location.path("/404");
+                $location.search({}).path("/404");
               } else {
                 $scope.handleHttpError(e);
               }
@@ -863,7 +867,7 @@ module fng.services {
 
       setData,
 
-      setUpLookupOptions: function setUpLookupOptions(lookupCollection, schemaElement, $scope, ctrlState, handleSchema) {
+      setUpLookupOptions: function setUpLookupOptions(lookupCollection, schemaElement, $scope, ctrlState) {
         const optionsList = $scope[schemaElement.options] = [];
         const idList = $scope[schemaElement.ids] = [];
         const dataRequest = !!schemaElement.filter
diff --git a/src/server/data_form.ts b/src/server/data_form.ts
@@ -869,9 +869,9 @@ export class FormsAngular {
             } else {
                 if (formName) {
                     try {
-                        formSchema = req.resource.model.schema.statics['form'](formName, req);
+                        formSchema = req.resource.model.schema.statics['form'](encodeURIComponent(formName), req);
                     } catch (e) {
-                        return res.status(500).send(e.message);
+                        return res.status(404).send(e.message);
                     }
                 }
                 let paths = this.preprocess(req.resource, req.resource.model.schema.paths, formName, formSchema).paths;
@@ -975,7 +975,7 @@ export class FormsAngular {
         aggregationParam: any | any[],
         hiddenFields,
         findFuncQry: any,
-        req? : Express.Request): Promise<any[]> {
+        req? : any): Promise<any[]> {
         let that = this;
         let array = Array.isArray(aggregationParam) ? aggregationParam : [aggregationParam];
         let retVal = [];
diff --git a/test/unit/baseControllerSpec.js b/test/unit/baseControllerSpec.js
@@ -39,17 +39,15 @@ describe('BaseCtrl', function () {
     });
 
     it('should handle an invalid model', function () {
-      inject(function (_$httpBackend_, $rootScope, $controller) {
+      inject(function (_$httpBackend_, $rootScope, $controller, $location) {
         $httpBackend = _$httpBackend_;
         $httpBackend.when('GET', '/api/schema/collection').respond(function () {
           return [404, 'Some error', {}];
         });
         scope = $rootScope.$new();
         ctrl = $controller('BaseCtrl', {$scope: scope, RoutingService});
         $httpBackend.flush();
-        expect(scope.alertTitle).toBe('Error!');
-        expect(scope.errorMessage.toString()).toBe('404 Some error');
-
+        expect($location.path()).toBe('/404');
       });
     });
 
