AB#8166 group field -> org field

austrakka/components/group/__init__.py

@@ -1,7 +1,6 @@
 # pylint: disable=expression-not-assigned
 import click
 
-from austrakka.components.group.field import field
 from austrakka.components.group.funcs import add_group
 from austrakka.components.group.funcs import list_group
 from austrakka.components.group.funcs import update_group
@@ -19,7 +18,6 @@ def group(ctx):
     ctx.context = ctx.parent.context
 
 
-group.add_command(field) if show_admin_cmds() else None
 group.add_command(role) if show_admin_cmds() else None
 
 

austrakka/components/org/__init__.py

@@ -1,3 +1,4 @@
+# pylint: disable=expression-not-assigned
 import click
 
 from austrakka.utils.output import table_format_option
@@ -10,6 +11,8 @@
 from austrakka.utils.privilege import ORG_RESOURCE
 from austrakka.components.iam.privilege import privilege_subcommands
 from austrakka.components.log import log_subcommands
+from austrakka.components.org.field import field
+from austrakka.utils.cmd_filter import show_admin_cmds
 from .funcs import list_orgs
 from .funcs import add_org
 from .funcs import update_org
@@ -23,6 +26,7 @@ def org(ctx):
 
 org.add_command(privilege_subcommands(ORG_RESOURCE))
 org.add_command(log_subcommands(ORG_RESOURCE))
+org.add_command(field) if show_admin_cmds() else None
 
 @org.command('list', help="List organisations")
 @table_format_option()

austrakka/components/org/field/__init__.py

@@ -0,0 +1,47 @@
+import click
+
+from austrakka.utils.output import table_format_option
+from austrakka.utils.cmd_filter import hide_admin_cmds
+from austrakka.utils.options import *
+from .funcs import \
+    add_field, \
+    remove_field, \
+    list_field
+
+
+@click.group()
+@click.pass_context
+def field(ctx):
+    """Commands related to org fields"""
+    ctx.context = ctx.parent.context
+
+
+@field.command('add', hidden=hide_admin_cmds())
+@opt_identifier(help="Org identifier")
+@opt_field_name()
+def group_add_field(identifier, field_names):
+    '''
+    Add fields to the data view for the given org
+    '''
+    add_field(identifier, field_names)
+
+
+@field.command('remove', hidden=hide_admin_cmds())
+@opt_identifier(help="Org identifier")
+@opt_field_name()
+def group_remove_field(identifier, field_names):
+    '''
+    Remove fields from the data view for the given org
+    '''
+    remove_field(identifier, field_names)
+
+
+@field.command('list', hidden=hide_admin_cmds())
+@opt_identifier(help="Org identifier")
+@table_format_option()
+@opt_view_type()
+def group_list_field(identifier: str, out_format: str, view_type: str):
+    '''
+    List of fields in data view for the given org
+    '''
+    list_field(identifier, out_format, view_type)

austrakka/components/org/field/funcs.py

@@ -0,0 +1,44 @@
+from typing import List
+
+from austrakka.utils.api import api_patch
+from austrakka.utils.misc import logger_wraps
+from austrakka.utils.output import get_viewtype_columns
+from austrakka.utils.paths import ORG_V2_PATH
+from austrakka.utils.helpers.output import call_get_and_print
+
+
+@logger_wraps()
+def add_field(identifier: str, field_names: List[str]):
+    return api_patch(
+        path=f'{ORG_V2_PATH}/{identifier}/Fields/Add',
+        data={
+            "fields": field_names
+        }
+    )
+
+
+@logger_wraps()
+def remove_field(identifier: str, field_names: List[str]):
+    return api_patch(
+        path=f'{ORG_V2_PATH}/{identifier}/Fields/Remove',
+        data={
+            "fields": field_names
+        }
+    )
+
+
+@logger_wraps()
+def list_field(identifier: str, out_format: str, view_type: str):
+    compact_fields = [
+        "columnName",
+        "metaDataColumnTypeName",
+        "description",
+        "primitiveType",
+        "isActive",
+    ]
+    columns = get_viewtype_columns(view_type, compact_fields, [])
+    call_get_and_print(
+        f'{ORG_V2_PATH}/{identifier}/Fields',
+        out_format,
+        restricted_cols=columns,
+    )

austrakka/utils/helpers/output.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Dict, Union, List
 from loguru import logger
 
 from austrakka.utils.api import api_get
@@ -10,7 +10,7 @@ def call_get_and_print(
         path: str,
         out_format: str,
         params: Dict = None,
-        restricted_cols: list[str] = None,
+        restricted_cols: Union[List[str], None] = None,
         datetime_cols: list[str] = None
 ):
     params = {} if params is None else params