Pull request update/241217

7b324d5 OS-8056. Relocate the Add Power Schedule button to the table action bar 4110cb9 OS-8059. [Dependabot] Infinite loop in nanoid 3f6b6b7 OS-4038. Not raise error in available_filters on missing cloud accounts 8ee0fdd OS-4897. Discover SGs as strings in AWS
hystax · Dec 17, 2024 · c5a9e52 · c5a9e52
2 parents a268330 + 7b324d5
commit c5a9e52
Show file tree

Hide file tree

Showing 10 changed files with 120 additions and 82 deletions.
diff --git a/bumiworker/bumiworker/modules/recommendations/insecure_security_groups.py b/bumiworker/bumiworker/modules/recommendations/insecure_security_groups.py
@@ -159,8 +159,7 @@ def _get_aws_insecure(self, config, resources, excluded_pools,
             if s_groups is None:
                 continue
             security_groups_map = region_sg_map[region]
-            for group in s_groups:
-                group_id = group['GroupId']
+            for group_id in s_groups:
                 instances = security_groups_map.get(group_id, [])
                 instances.append(instance)
                 security_groups_map[group_id] = instances

diff --git a/jira_ui/ui/package-lock.json b/jira_ui/ui/package-lock.json
diff --git a/jira_ui/ui/package.json b/jira_ui/ui/package.json
@@ -23,8 +23,8 @@
     "react-markdown": "^9.0.1",
     "react-router-dom": "^6.19.0",
     "remark-gfm": "^4.0.0",
-    "vite": "^5.4.6",
-    "vite-tsconfig-paths": "^5.0.1"
+    "vite": "^5.4.11",
+    "vite-tsconfig-paths": "^5.1.4"
   },
   "scripts": {
     "start": "vite",

diff --git a/ngui/ui/package.json b/ngui/ui/package.json
@@ -28,7 +28,7 @@
     "@types/react": "^18.2.45",
     "@types/react-dom": "^18.2.18",
     "@uiw/react-textarea-code-editor": "^2.1.1",
-    "@vitejs/plugin-react-swc": "^3.7.0",
+    "@vitejs/plugin-react-swc": "^3.7.2",
     "ajv": "^8.12.0",
     "analytics": "^0.8.1",
     "axios": "^1.7.4",
@@ -74,8 +74,8 @@
     "typescript": "^5.3.3",
     "unist-util-visit": "^5.0.0",
     "uuid": "^9.0.0",
-    "vite": "^5.4.6",
-    "vite-tsconfig-paths": "^5.0.1"
+    "vite": "^5.4.11",
+    "vite-tsconfig-paths": "^5.1.4"
   },
   "scripts": {
     "start": "vite",

diff --git a/ngui/ui/pnpm-lock.yaml b/ngui/ui/pnpm-lock.yaml
diff --git a/ngui/ui/src/components/PowerSchedules/PowerSchedules.tsx b/ngui/ui/src/components/PowerSchedules/PowerSchedules.tsx
@@ -47,20 +47,7 @@ const PowerSchedules = ({
   const actionBarDefinition = {
     title: {
       messageId: "powerSchedulesTitle"
-    },
-    items: [
-      {
-        key: "btn-add",
-        dataTestId: "btn_add",
-        icon: <AddOutlinedIcon fontSize="small" />,
-        messageId: "add",
-        color: "success",
-        variant: "contained",
-        type: "button",
-        requiredActions: ["EDIT_PARTNER"],
-        action: () => navigate(CREATE_POWER_SCHEDULE)
-      }
-    ]
+    }
   };
 
   const tableData = useMemo(() => powerSchedules, [powerSchedules]);
@@ -169,7 +156,34 @@ const PowerSchedules = ({
     <>
       <ActionBar data={actionBarDefinition} />
       <PageContentWrapper>
-        {isGetPowerSchedulesLoading ? <TableLoader /> : <Table withSearch data={tableData} columns={columns} pageSize={50} />}
+        {isGetPowerSchedulesLoading ? (
+          <TableLoader />
+        ) : (
+          <Table
+            withSearch
+            data={tableData}
+            columns={columns}
+            actionBar={{
+              show: true,
+              definition: {
+                items: [
+                  {
+                    key: "btn-add",
+                    dataTestId: "btn_add",
+                    icon: <AddOutlinedIcon fontSize="small" />,
+                    messageId: "add",
+                    color: "success",
+                    variant: "contained",
+                    type: "button",
+                    requiredActions: ["EDIT_PARTNER"],
+                    action: () => navigate(CREATE_POWER_SCHEDULE)
+                  }
+                ]
+              }
+            }}
+            pageSize={50}
+          />
+        )}
       </PageContentWrapper>
     </>
   );