From 9185a1203570a0935a75773723359f43ffd13037 Mon Sep 17 00:00:00 2001
From: William Lachance <wlach@protonmail.com>
Date: Mon, 13 Sep 2021 18:07:49 -0400
Subject: [PATCH] Update "removed" definition

We'll say that an item is only removed if it (1) has an "in_source"
annotation and it is false. This annotation should always be present
for metrics, but is not currently set for any other object.
---
 src/components/ItemList.svelte     |  4 ++--
 src/pages/MetricDetail.svelte      |  2 +-
 src/state/filter.js                |  2 +-
 src/state/{metrics.js => items.js} |  6 ++++++
 tests/state.items.test.js          | 25 +++++++++++++++++++++++++
 tests/state.metrics.test.js        | 13 -------------
 6 files changed, 35 insertions(+), 17 deletions(-)
 rename src/state/{metrics.js => items.js} (51%)
 create mode 100644 tests/state.items.test.js
 delete mode 100644 tests/state.metrics.test.js

diff --git a/src/components/ItemList.svelte b/src/components/ItemList.svelte
index d22cda3be..099077081 100644
--- a/src/components/ItemList.svelte
+++ b/src/components/ItemList.svelte
@@ -10,7 +10,7 @@
   import Label from "./Label.svelte";
 
   import { filterUncollectedItems } from "../state/filter";
-  import { isExpired } from "../state/metrics";
+  import { isExpired, isRemoved } from "../state/items";
   import { pageState, updateURLState } from "../state/stores";
 
   let DEFAULT_ITEMS_PER_PAGE = 20;
@@ -189,7 +189,7 @@
                       />
                     {/each}
                   {/if}
-                  {#if !item.in_source}
+                  {#if isRemoved(item)}
                     <Label text="removed" />
                   {:else if isExpired(item.expires)}
                     <Label text="expired" />
diff --git a/src/pages/MetricDetail.svelte b/src/pages/MetricDetail.svelte
index c1368719e..95a39f956 100644
--- a/src/pages/MetricDetail.svelte
+++ b/src/pages/MetricDetail.svelte
@@ -20,7 +20,7 @@
   import { pageTitle, pageState, updateURLState } from "../state/stores";
   import { getBigQueryURL } from "../state/urls";
 
-  import { isExpired } from "../state/metrics";
+  import { isExpired } from "../state/items";
 
   export let params;
 
diff --git a/src/state/filter.js b/src/state/filter.js
index dede5584f..d3ab1a7e7 100644
--- a/src/state/filter.js
+++ b/src/state/filter.js
@@ -1,4 +1,4 @@
-import { isExpired } from "./metrics";
+import { isExpired } from "./items";
 
 export const filterUncollectedItems = (items, showUncollected) =>
   items.filter(
diff --git a/src/state/metrics.js b/src/state/items.js
similarity index 51%
rename from src/state/metrics.js
rename to src/state/items.js
index 4b7625f43..ab995e84d 100644
--- a/src/state/metrics.js
+++ b/src/state/items.js
@@ -1,3 +1,9 @@
+export const isRemoved = (item) => {
+  // only consider an item expired if it has an in_source property
+  // and it is false
+  return item.in_source === false;
+};
+
 export const isExpired = (expiryDate) => {
   if (expiryDate === "never" || expiryDate === undefined) {
     return false;
diff --git a/tests/state.items.test.js b/tests/state.items.test.js
new file mode 100644
index 000000000..dc8f19595
--- /dev/null
+++ b/tests/state.items.test.js
@@ -0,0 +1,25 @@
+import { isExpired, isRemoved } from "../src/state/items";
+
+describe("checking if a date has expired", () => {
+  it("returns True if input is 'never' or undefined", () => {
+    expect(isExpired("never") || isExpired(undefined)).toEqual(false);
+  });
+  it("returns True if input is a date from the past", () => {
+    expect(isExpired("2021-01-01")).toEqual(true);
+  });
+  it("returns False if input is a date from the future", () => {
+    expect(isExpired("3021-01-01")).toEqual(false);
+  });
+});
+
+describe("isRemoved works as expected", () => {
+  it("returns true if in_source is false", () => {
+    expect(isRemoved({ in_source: false })).toEqual(true);
+  });
+  it("returns false if in_source is undefined", () => {
+    expect(isRemoved({})).toEqual(false);
+  });
+  it("returns false if in_source is true", () => {
+    expect(isRemoved({ in_source: true })).toEqual(false);
+  });
+});
diff --git a/tests/state.metrics.test.js b/tests/state.metrics.test.js
deleted file mode 100644
index f5ebae697..000000000
--- a/tests/state.metrics.test.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { isExpired } from "../src/state/metrics";
-
-describe("checking if a date has expired", () => {
-  it("returns True if input is 'never' or undefined", () => {
-    expect(isExpired("never") || isExpired(undefined)).toEqual(false);
-  });
-  it("returns True if input is a date from the past", () => {
-    expect(isExpired("2021-01-01")).toEqual(true);
-  });
-  it("returns False if input is a date from the future", () => {
-    expect(isExpired("3021-01-01")).toEqual(false);
-  });
-});