Merge pull request #546 from Heigvd/sam-bin-resources

Bin resources improvement

Author: SandraMonnier

colab-webapp/src/main/node/app/src/components/resources/resourcesCommonType.ts

@@ -92,6 +92,12 @@ export function isActive1(resource: ResourceAndRef): boolean {
   return isActive2(directResource);
 }
 
+export function isDead1(resource: ResourceAndRef): boolean {
+  const directResource = getTheDirectResource(resource);
+
+  return isDead2(directResource);
+}
+
 export function isActive2(resource: Resource | ResourceRef): boolean {
   if (entityIs(resource, 'ResourceRef')) {
     return isResourceRefActive(resource);
@@ -100,6 +106,14 @@ export function isActive2(resource: Resource | ResourceRef): boolean {
   }
 }
 
+export function isDead2(resource: Resource | ResourceRef): boolean {
+  if (entityIs(resource, 'ResourceRef')) {
+    return isResourceRefDead(resource);
+  } else {
+    return false;
+  }
+}
+
 export function isResourceActive(resource: Resource): boolean {
   return !resource.deprecated;
 }
@@ -108,6 +122,10 @@ export function isResourceRefActive(resourceRef: ResourceRef): boolean {
   return !resourceRef.refused && !resourceRef.residual;
 }
 
+export function isResourceRefDead(resourceRef: ResourceRef): boolean {
+  return resourceRef.residual;
+}
+
 /**
  * Get access level the current user has on the given resource
  */

colab-webapp/src/main/node/app/src/store/selectors/resourceSelector.ts

@@ -19,6 +19,7 @@ import { DocumentOwnership } from '../../components/documents/documentCommonType
 import {
   isActive1,
   isActive2,
+  isDead1,
   ResourceAndRef,
   ResourceCallContext,
 } from '../../components/resources/resourcesCommonType';
@@ -169,7 +170,9 @@ export function useAndLoadResources(contextData: ResourceCallContext): {
   }, [contextData, dispatch, status]);
 
   const activeResources = resources.filter(resource => isActive1(resource));
-  const ghostResources = difference(resources, activeResources);
+  const ghostResources = difference(resources, activeResources).filter(
+    resource => !isDead1(resource),
+  );
 
   return { activeResources, ghostResources, status };
 }