Add handling for un-auth users

Author: ebba-eliasson

dds_cli/data_lister.py

@@ -74,6 +74,20 @@ def __init__(
 
     # Public methods ########################### Public methods #
 
+
+    def gui_list_projects(self):
+        """Get a list of project(s) the user is involved in."""
+        response, _ = dds_cli.utils.perform_request(
+            DDSEndpoint.LIST_PROJ,
+            headers=self.token,
+            method="get",
+            json={"usage": self.show_usage, "show_all": False},
+            error_message="Failed to get list of projects",
+            timeout=DDSEndpoint.TIMEOUT,
+        )
+
+        return response
+
     def list_projects(self, sort_by="Updated", show_all: bool = False):
         """Get a list of project(s) the user is involved in."""
         # Get projects from API

dds_cli/gui_poc/app.py

@@ -9,6 +9,7 @@
 from dds_cli.gui_poc.data import Data
 from dds_cli.gui_poc.home import HomeScreen
 from dds_cli.gui_poc.auth import AuthLogin, AuthLogout, AuthStatus
+from dds_cli.gui_poc.project import Project
 from dds_cli.gui_poc.user import User
 from dds_cli.gui_poc.utils import DDSModal
 
@@ -50,6 +51,7 @@ def __init__(self, token_path: str):
         Binding("o", "logout", "Logout", tooltip="Logout from DDS."),
         Binding("u", "user", "User", tooltip="Show user info."),
         Binding("d", "data", "Data", tooltip="Show data info."),
+        Binding("p", "project", "Project", tooltip="Show project info."),
     ]
 
     def compose(self) -> ComposeResult:
@@ -58,9 +60,11 @@ def compose(self) -> ComposeResult:
             with Container(id="home"):
                 yield HomeScreen()
             with Container(id="user"):
-                yield User()
+                yield User(self.token_path)
             with Container(id="data"):
                 yield Data()
+            with Container(id="project"):
+                yield Project()
         yield Footer()
 
     def action_token(self) -> None:
@@ -81,6 +85,9 @@ def action_home(self) -> None:
     def action_data(self) -> None:
         self.query_one(ContentSwitcher).current = "data"
 
+    def action_project(self) -> None:
+        self.query_one(ContentSwitcher).current = "project"
+
     def on_mount(self) -> None:
         self.register_theme(theme)
         self.theme = "custom"

dds_cli/gui_poc/app.tcss

@@ -115,19 +115,23 @@ AuthLogout {
 
 /* Button */
 
-Button{
-    border: none;
-    height: 3;
-    padding: 0 2 0 2; /* Set padding for centered content without default border*/
+# Button{
+#     border: none;
+#     height: 3;
+#     padding: 0 2 0 2; /* Set padding for centered content without default border*/
+# }
+
+Button {
+    padding: 0 2 0 2; 
 }
 
-Button:hover{
-    border: none;
-} 
+# Button:hover{
+#     border: none;
+# } 
 
-Button:focus{
-    border: none;
-} 
+# Button:focus{
+#     border: none;
+# } 
 
 /* Input */
 

dds_cli/gui_poc/docs/difference.jpeg

@@ -67,6 +67,14 @@ variables: dict[str, str] = field(default_factory=dict)
 
 The textual styling is as said limited in comparison to the full flexibility of CSS styles applications. However, the limited custumization options ensures uniform styling accross the application, both in basic and custom widgets. 
 
+Textual is recomanded to not run in the default macos terminal, as it will look ugly. It will still function properly though. 
+
+**Question**: Design the application as usual and recommend users to use a different terminal, or design the gui with the macos termial in mind? What is the most commonly used terminal. 
+
+![Image](difference.jpeg)
+
+The difference between iTerm2 terminal (left) and macos default terminal (right). The borders and colors are off in the macos terminal. 
+
 ### Text
 
 There is no support for different fontsizes in textual. 

dds_cli/gui_poc/docs/poc_ux_ui.md

@@ -0,0 +1,40 @@
+from textual import events
+from textual.app import ComposeResult
+from textual.containers import Container, VerticalScroll
+from textual.widget import Widget
+from textual.widgets import Button, ContentSwitcher, DataTable, Label, LoadingIndicator
+
+from dds_cli.gui_poc.utils import DDSSidebar
+from dds_cli.data_lister import DataLister
+
+
+class ProjectList(Widget):
+    def compose(self) -> ComposeResult:
+        with VerticalScroll(id="project-list"):
+            yield Button("Get project list", id="get-project-list")
+            yield Label("Project list", id="project-list-label")
+
+
+    def on_button_pressed(self, event: events.Click) -> None:
+        if event.button.id == "get-project-list":
+            self.get_project_list()
+
+    async def get_project_list(self):            
+        #self.query_one("#project-list").mount(LoadingIndicator())
+        #project_list = await DataLister().gui_list_projects()
+        #self.query_one(LoadingIndicator).remove()
+        self.query_one("#project-list-label").update("done")
+        return None
+
+class Project(Widget):
+    def __init__(self):
+        super().__init__()
+
+    def compose(self) -> ComposeResult:
+        yield DDSSidebar([
+            "list",
+            "info"
+        ], title="Project")
+        with ContentSwitcher(initial="list", id="project"):
+            with Container(id="list"):
+                yield ProjectList()

dds_cli/gui_poc/project.py

@@ -2,7 +2,7 @@
 from textual.app import ComposeResult
 from textual.containers import Container
 from textual.widget import Widget
-from textual.widgets import ContentSwitcher, DataTable
+from textual.widgets import ContentSwitcher, DataTable, Static
 from dds_cli.account_manager import AccountManager
 from dds_cli.gui_poc.utils import DDSSidebar
 
@@ -39,36 +39,46 @@
 """
 
 class UserInfo(Widget):
-    def __init__(self, user_info: dict):
+    def __init__(self, token_path: str):
         super().__init__()
-        self.user_info = user_info
+        self.user = None
+        self.token_path = token_path
+        self.user_info = None
 
     def compose(self) -> ComposeResult:
         with Container(id="user-info"):
             yield DataTable()
 
     def on_mount(self) -> None:
-        table = self.query_one(DataTable)
-        table.add_column("Key")
-        table.add_column("Value")
-        for key, value in self.user_info.items():
-            table.add_row(key, value)
+        try:
+            self.user = AccountManager(authenticate=False, token_path=self.token_path) 
+            # Set authenticate to false to avoid going into authentication step in the base class init 
+            self.user_info = self.user.get_user_info()
+        except Exception as e:
+            print(e)
+
+        if self.user_info:
+            table = self.query_one(DataTable)
+            table.add_column("Key")
+            table.add_column("Value")
+            for key, value in self.user.get_user_info().items():
+               table.add_row(key, value)
 
 
 class User(Widget):
-    def __init__(self):
+    def __init__(self, token_path: str):
         super().__init__()
-        self.user = AccountManager()
         self.id = "user"
-
+        self.token_path = token_path
+    
     def compose(self) -> ComposeResult:
         yield DDSSidebar([
             "info"
 
         ], help_text)
         with ContentSwitcher(initial="info", id="user"):
             with Container(id="info"):
-                yield UserInfo(self.user.get_user_info())
+                yield UserInfo(self.token_path)
 
     def on_button_pressed(self, event: events.Click) -> None:
         if event.button.id == "info":