From 41806b5e825fc9c979befe83c6bd8474aeeb9989 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <rmidhunsuresh@gmail.com>
Date: Wed, 30 Jun 2021 14:37:41 +0530
Subject: [PATCH] Remove duplication

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
---
 src/domain/navigation/index.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js
index 677319a1..c3d3f264 100644
--- a/src/domain/navigation/index.js
+++ b/src/domain/navigation/index.js
@@ -87,6 +87,11 @@ function roomsSegmentWithRoom(rooms, roomId, path) {
     }
 }
 
+function pushRightPanelSegment(array, segment) {
+    array.push(new Segment("right-panel"));
+    array.push(new Segment(segment));
+}
+
 export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
     // substr(1) to take of initial /
     const parts = urlPath.substr(1).split("/");
@@ -116,8 +121,7 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
             }
             segments.push(new Segment("room", roomId));
             if (currentNavPath.get("details")?.value) {
-                segments.push(new Segment("right-panel"));
-                segments.push(new Segment("details"));
+                pushRightPanelSegment(segments, "details");
             }
         } else if (type === "last-session") {
             let sessionSegment = currentNavPath.get("session");
@@ -127,13 +131,8 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
             if (sessionSegment) {
                 segments.push(sessionSegment);
             }
-        } else if (type === "details") {
-            segments.push(new Segment("right-panel"));
-            segments.push(new Segment("details"));
-        } else if (type === "members") {
-            //TODO: Fix duplication here.
-            segments.push(new Segment("right-panel"));
-            segments.push(new Segment("members"));
+        } else if (type === "details" || type === "members") {
+            pushRightPanelSegment(segments, type);
         } else {
             // might be undefined, which will be turned into true by Segment 
             const value = iterator.next().value;