Merge branch 'develop' into feature_2822

Author: SolidProgramming

roles/database/files/sql/idempotent/fworch-texts.sql

@@ -1154,6 +1154,14 @@ INSERT INTO txt VALUES ('displayRejected', 	    'German',	'Abgelehnte anzeigen')
 INSERT INTO txt VALUES ('displayRejected', 	    'English',	'Display rejected');
 INSERT INTO txt VALUES ('add_interface', 	    'German',	'Schnittstelle hinzufügen');
 INSERT INTO txt VALUES ('add_interface', 	    'English',	'Add Interface');
+INSERT INTO txt VALUES ('edit_interface', 	    'German',	'Schnittstelle bearbeiten');
+INSERT INTO txt VALUES ('edit_interface', 	    'English',	'Edit Interface');
+INSERT INTO txt VALUES ('interface_contain_nwarea','German','Schnittstellen dürfen keine Netzbereiche enthalten');
+INSERT INTO txt VALUES ('interface_contain_nwarea','English','Interfaces must not contain network areas');
+INSERT INTO txt VALUES ('direction_contain_nwarea','German','Quelle und Ziel dürfen nicht gleichzeitig einen Netzbereich enthalten');
+INSERT INTO txt VALUES ('direction_contain_nwarea','English','Source and destination must not contain a network area at the same time');
+INSERT INTO txt VALUES ('only_common_service',  'German',   'Dieser Netzbereich kann nur in der Registerkarte Gemeinsame Dienste verwendet werden.');
+INSERT INTO txt VALUES ('only_common_service',  'English',  'This network area can only be used in common services tab');
 INSERT INTO txt VALUES ('delete_interface', 	'German',	'Schnittstelle löschen');
 INSERT INTO txt VALUES ('delete_interface', 	'English',	'Delete Interface');
 INSERT INTO txt VALUES ('insert_forbidden', 	'German',	'Einfügen verboten');

roles/lib/files/FWO.Api.Client/APIcalls/allObjects/getAllObjectDetails.graphql

@@ -2,7 +2,7 @@ query getAllObjectDetails (
   $management_id: [Int!]
   $type: [String!]
   $uid: [String!]
-  $time: String
+  $import_id: bigint
   $obj_name: [String!]
   $limit: Int
   $offset: Int
@@ -25,7 +25,8 @@ query getAllObjectDetails (
       offset: $offset
       where: {
         stm_obj_typ: { obj_typ_name: { _in: $type } }
-        active: { _eq: true }
+        obj_last_seen: { _gte: $import_id }
+        obj_create: { _lte: $import_id }
         obj_name: { _in: $obj_name }
         obj_uid: { _in: $uid }
       }
@@ -38,7 +39,8 @@ query getAllObjectDetails (
       offset: $offset
       where: {
         stm_svc_typ: { svc_typ_name: { _in: $type } }
-        active: { _eq: true }
+        svc_last_seen: { _gte: $import_id }
+        svc_create: { _lte: $import_id }
         svc_name: { _in: $obj_name }
         svc_uid: { _in: $uid }
       }
@@ -51,7 +53,8 @@ query getAllObjectDetails (
       offset: $offset
       where: {
         stm_usr_typ: { usr_typ_name: { _in: $type } }
-        active: { _eq: true }
+        user_last_seen: { _gte: $import_id }
+        user_create: { _lte: $import_id }
         user_name: { _in: $obj_name }
         user_uid: { _in: $uid }
       }

roles/lib/files/FWO.Api.Client/APIcalls/networkObject/getNetworkObjectDetails.graphql

@@ -2,7 +2,7 @@ query getNetworkObjectDetails(
   $management_id: [Int!]
   $nwObjTyp: [String!]
   $nwObjUid: [String!]
-  $time: String
+  $import_id: bigint
   $obj_name: [String!]
   $obj_ip: [cidr!]
   $limit: Int
@@ -16,12 +16,13 @@ query getNetworkObjectDetails(
       offset: $offset
       where: {
         stm_obj_typ: { obj_typ_name: { _in: $nwObjTyp } }
-        active: { _eq: true }
+        obj_last_seen: { _gte: $import_id }
+        obj_create: { _lte: $import_id }
         obj_name: { _in: $obj_name }
         obj_ip: { _in: $obj_ip }
         obj_uid: { _in: $nwObjUid }
       }
-      order_by: { obj_name: asc }
+      order_by: [{ obj_name: asc }, { obj_id: asc }]
     ) {
       ...networkObjectDetails
     }

roles/lib/files/FWO.Api.Client/APIcalls/networkService/getNetworkServiceDetails.graphql

@@ -1,6 +1,6 @@
 query getNetworkServiceDetails(
   $management_id: [Int!]
-  $time: String
+  $import_id: bigint
   $svc_name: [String!]
   $svc_port: [Int!]
   $limit: Int
@@ -13,11 +13,12 @@ query getNetworkServiceDetails(
       limit: $limit
       offset: $offset
       where: {
-        active: { _eq: true }
+        svc_last_seen: { _gte: $import_id }
+        svc_create: { _lte: $import_id }
         svc_name: { _in: $svc_name }
         svc_port: { _in: $svc_port }
       }
-      order_by: { svc_name: asc }
+      order_by: [{ svc_name: asc }, { svc_id: asc }]
     ) {
       ...networkServiceDetails
     }

roles/lib/files/FWO.Api.Client/APIcalls/user/getUserDetails.graphql

@@ -1,6 +1,6 @@
-query listUsers(
+query getUserDetails(
   $management_id: [Int!]
-  $time: String
+  $import_id: bigint
   $user_name: [String!]
   $limit: Int
   $offset: Int
@@ -11,8 +11,12 @@ query listUsers(
     userObjects: usrs(
       limit: $limit
       offset: $offset
-      where: { active: { _eq: true }, user_name: { _in: $user_name } }
-      order_by: { user_name: asc }
+      where: {
+        user_last_seen: { _gte: $import_id }
+        user_create: { _lte: $import_id }
+        user_name: { _in: $user_name }
+      }
+      order_by: [{ user_name: asc }, { user_id: asc }]
     ) {
       ...userDetails
     }

roles/lib/files/FWO.Data/Direction.cs

@@ -0,0 +1,8 @@
+namespace FWO.Data
+{
+    public enum Direction
+    {
+        Source,
+        Destination
+    }
+}