From eb78346dc1ca5982faa3c69ebadfd831ea6ac847 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 17 Dec 2018 17:15:04 +0200
Subject: [PATCH] Projects

---
 lib/redux/project/project_selectors.dart | 8 ++++++--
 stubs/redux/stub/stub_selectors          | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/redux/project/project_selectors.dart b/lib/redux/project/project_selectors.dart
index 26ccd49b5..9bad585bb 100644
--- a/lib/redux/project/project_selectors.dart
+++ b/lib/redux/project/project_selectors.dart
@@ -36,14 +36,18 @@ List<int> filteredProjectsSelector(
     BuiltMap<int, ClientEntity> clientMap) {
   final list = projectList.where((projectId) {
     final project = projectMap[projectId];
-
-    if (project.clientId > 0 && clientMap[project.clientId].isArchived) {
+    final client = clientMap[project.clientId] ?? ClientEntity(id: project.clientId);
+    if (client == null || !client.isActive) {
       return false;
     }
 
     if (!project.matchesStates(projectListState.stateFilters)) {
       return false;
     }
+    if (projectListState.filterEntityId != null &&
+        project.clientId != projectListState.filterEntityId) {
+      return false;
+    }
     if (projectListState.custom1Filters.isNotEmpty &&
         !projectListState.custom1Filters.contains(project.customValue1)) {
       return false;
diff --git a/stubs/redux/stub/stub_selectors b/stubs/redux/stub/stub_selectors
index 8ee55260e..d74c7f997 100644
--- a/stubs/redux/stub/stub_selectors
+++ b/stubs/redux/stub/stub_selectors
@@ -32,6 +32,10 @@ List<int> filteredStubsSelector(BuiltMap<int, StubEntity> stubMap,
     if (!stub.matchesStates(stubListState.stateFilters)) {
       return false;
     }
+    if (stubListState.filterEntityId != null &&
+        stub.clientId != stubListState.filterEntityId) {
+      return false;
+    }
     if (stubListState.custom1Filters.isNotEmpty &&
         !stubListState.custom1Filters.contains(stub.customValue1)) {
       return false;