From 489b2547130ae7e56dac6780e82ff6cdc54e6abe Mon Sep 17 00:00:00 2001
From: sai-neetha <sai-neetha.phulmali@highstreet-technologies.com>
Date: Wed, 18 Oct 2023 15:31:18 +0200
Subject: ConfigurationApp: OAI wrong generation of rest request

ConfigurationApp: OAI wrong generation of rest request

Issue-ID: CCSDK-3945
Change-Id: Ida36a240a17c1fd649915378efd7de4a0e47c4d8
Signed-off-by: sai-neetha <sai-neetha.phulmali@highstreet-technologies.com>
---
 .../src/views/configurationApplication.tsx         |  1 +
 .../apps/configurationApp/src/yang/yangParser.ts   | 28 +++++++++++-----------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'sdnr')

diff --git a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
index 0f143d818..d7f59d61c 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
+++ b/sdnr/wt/odlux/apps/configurationApp/src/views/configurationApplication.tsx
@@ -919,6 +919,7 @@ class ConfigurationApplicationComponent extends React.Component<ConfigurationApp
   }
 
   render() {
+    console.log('ConfigurationApplication.render()', this.props);
     return this.props.collectingData || !this.state.viewData
       ? this.renderCollectingData()
       : this.props.listSpecification
diff --git a/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts b/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
index 2dbbae274..85eeb41a4 100644
--- a/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
+++ b/sdnr/wt/odlux/apps/configurationApp/src/yang/yangParser.ts
@@ -492,20 +492,6 @@ export class YangParser {
 
   public postProcess() {
 
-    // execute all post processes like resolving in proper order
-    this._unionsToResolve.forEach(cb => {
-      try { cb(); } catch (error) {
-        console.warn(error.message);
-      }
-    });
-
-    // process all groupings
-    this._groupingsToResolve.filter(vs => vs.uses && vs.uses[ResolveFunction]).forEach(vs => {
-      try { vs.uses![ResolveFunction] !== undefined && vs.uses![ResolveFunction]!('|'); } catch (error) {
-        console.warn(`Error resolving: [${vs.name}] [${error.message}]`);
-      }
-    });
-
     /**
      * This is to fix the issue for sequential execution of modules based on their child and parent relationship
      * We are sorting the module object based on their augment status
@@ -622,6 +608,20 @@ export class YangParser {
       }
     });
 
+    // execute all post processes like resolving in proper order
+    this._unionsToResolve.forEach(cb => {
+      try { cb(); } catch (error) {
+        console.warn(error.message);
+      }
+    });
+
+    // process all groupings
+    this._groupingsToResolve.filter(vs => vs.uses && vs.uses[ResolveFunction]).forEach(vs => {
+      try { vs.uses![ResolveFunction] !== undefined && vs.uses![ResolveFunction]!('|'); } catch (error) {
+        console.warn(`Error resolving: [${vs.name}] [${error.message}]`);
+      }
+    });
+
     // resolve readOnly
     const resolveReadOnly = (view: ViewSpecification, parentConfig: boolean) => {
 
-- 
cgit 1.2.3-korg