Merge remote-tracking branch 'origin/master' into task/rename-cmd-fil…

…e-to-work-on-windows
bosley · Dec 9, 2023 · c20a719 · c20a719
2 parents 2a5357e + 92d65b7
commit c20a719
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/backend/app/app/api/api_v1/endpoints/node.py b/backend/app/app/api/api_v1/endpoints/node.py
@@ -188,14 +188,14 @@ async def read_graph(action_type, send_json, project_uuid):
                 'elements': blueprint.pop('elements'),
             }
             nodes.append(blueprint)
-        if len(edges[0]) >= 1:
-            [edges_data.append({
-                'id': f"{i}", 
-                'source': f"{e[2]['from'].id}",
-                'target': f"{e[3]['to'].id}",
-                'label': e[1][T.label],
-                'type': 'float'
-            }) for i, e in enumerate(chunks(edges[0], 4))]
+    if len(edges[0]) >= 1:
+        [edges_data.append({
+            'id': f"{i}", 
+            'source': f"{e[2]['from'].id}",
+            'target': f"{e[3]['to'].id}",
+            'label': e[1][T.label],
+            'type': 'float'
+        }) for i, e in enumerate(chunks(edges[0], 4))]
     await send_json({
         'action': 'addInitialLoad',
         'nodes': nodes,

diff --git a/frontend/src/routes/dashboard/_components/tabs/EntitiesPanel.tsx b/frontend/src/routes/dashboard/_components/tabs/EntitiesPanel.tsx
@@ -9,7 +9,7 @@ export default function EntitiesPanel({
   isLoading,
   isError,
   isSuccess,
-  refreshAllEntities,
+  refetchEntities,
 }: JSONObject) {
   const [showFavoriteEntities, setShowFavoriteEntities] = useState<boolean>(true);
   const [showEntities, setShowEntities] = useState(true);
@@ -32,7 +32,7 @@ export default function EntitiesPanel({
 
   const updateEntityOnBookmark = async (hid: string) => {
     await updateEntityIsFavorite({ hid })
-    refreshAllEntities()
+    refetchEntities()
   }
 
   return (

diff --git a/frontend/src/routes/dashboard/index.tsx b/frontend/src/routes/dashboard/index.tsx
@@ -64,7 +64,7 @@ export default function DashboardPage() {
     isLoading,
     isError,
     isSuccess,
-    refetch: refreshAllEntities,
+    refetch: refetchEntities,
   } = useGetEntitiesQuery({ skip: 0, limit: 50 })
 
   const scrollGraphs = ({ skip, limit, favoriteSkip, favoriteLimit }: ScrollGraphs) => {
@@ -153,7 +153,8 @@ export default function DashboardPage() {
                   isLoading={isLoading}
                   isError={isError}
                   isSuccess={isSuccess}
-                  updateEntities={refreshAllEntities}
+                  refetchEntities={refetchEntities}
+
                 />
               </Tab.Panel>
               <Tab.Panel className={styles["tab-panel"]}>
@@ -196,7 +197,7 @@ export default function DashboardPage() {
         refreshAllGraphs={async () => await refetchGraphs()}
       />
       <CreateEntityModal
-        refreshAllEntities={async () => await refreshAllEntities()}
+        refreshAllEntities={async () => await refetchEntities()}
         cancelCreateRef={cancelCreateEntityRef}
         isOpen={showCreateEntityModal}
         closeModal={() => setShowCreateEntityModal(false)}