Fixed review comments on code optimization and coderabbit review comments

Author: anilsahoo20

web/pgadmin/browser/server_groups/servers/static/js/membership.ui.js

@@ -75,7 +75,7 @@ export default class MembershipSchema extends BaseUISchema {
       deps: ['role'],
       depChange: (state) => {
         if(_.isUndefined(state.set)) {
-          state.set = false;
+          state.set = true;
         }
       }
     },

web/pgadmin/static/js/SchemaView/DataGridView/utils/createGridColumns.jsx

@@ -8,7 +8,7 @@
 //////////////////////////////////////////////////////////////
 
 
-import { isModeSupportedByField, isVersionSupportedByField } from 'sources/SchemaView/common';
+import { isModeSupportedByField, isFieldSupportedByPgVersion } from 'sources/SchemaView/common';
 import { getMappedCell } from '../mappedCell';
 
 
@@ -49,7 +49,7 @@ export function createGridColumns({schema, field, viewHelperProps}) {
         );
       columnVisibility[field.id] = isModeSupportedByField(
         field, viewHelperProps
-      ) && isVersionSupportedByField(field, viewHelperProps);
+      ) && isFieldSupportedByPgVersion(field, viewHelperProps);
 
       return {
         header: field.label||<>&nbsp;</>,

web/pgadmin/static/js/SchemaView/common.js

@@ -16,12 +16,15 @@ export const isModeSupportedByField = (field, helperProps) => (
   !field.mode || field.mode.indexOf(helperProps.mode) > -1
 );
 
-export const isVersionSupportedByField = (field, helperProps) => {
+export const isFieldSupportedByPgVersion = (field, helperProps) => {
   return (
     // serverInfo not found
     _.isUndefined(helperProps.serverInfo) ||
       // serverInfo found and it's within range
       (
+        _.isUndefined(field.server_type) ? true :
+          (helperProps.serverInfo.type in field.server_type)
+      ) && (
         _.isUndefined(field.min_version) ? true :
           (helperProps.serverInfo.version >= field.min_version)
       ) && (

web/pgadmin/static/js/SchemaView/options/index.js

@@ -15,6 +15,10 @@ import {
   evalInNonPropertyMode,
   FIELD_OPTIONS
 } from './common';
+import {
+  isFieldSupportedByPgVersion,
+  isModeSupportedByField
+} from '../common';
 import {
   evaluateFieldOptions,
   evaluateFieldsOption, 
@@ -45,23 +49,9 @@ registerOptionEvaluator(
   VISIBLE,
   // Evaluator
   ({schema, field, value, viewHelperProps}) => (
-    (
-      !field.mode || field.mode.indexOf(viewHelperProps.mode) > -1
-    ) && (
-    // serverInfo not found
-      _.isUndefined(viewHelperProps.serverInfo) ||
-        // serverInfo found and it's within range
-        ((
-          _.isUndefined(field.server_type) ? true :
-            (viewHelperProps.serverInfo.type in field.server_type)
-        ) && (
-          _.isUndefined(field.min_version) ? true :
-            (viewHelperProps.serverInfo.version >= field.min_version)
-        ) && (
-          _.isUndefined(field.max_version) ? true :
-            (viewHelperProps.serverInfo.version <= field.max_version)
-        ))
-    ) && (
+    isModeSupportedByField(field, viewHelperProps) 
+    && isFieldSupportedByPgVersion(field, viewHelperProps) 
+    && (
       _.isUndefined(field[VISIBLE]) ?  true :
         Boolean(evalFunc(schema, field[VISIBLE], value))
     )),