fix(server): Fix deleted Content in Dashboard (CCMS-150)

cotype · Oct 2, 2019 · 7a7e98d · 7a7e98d
1 parent b5728a5
commit 7a7e98d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/client/src/Dashboard/index.tsx b/client/src/Dashboard/index.tsx
@@ -69,9 +69,9 @@ export default function Dashboard() {
     <Container>
       {totalCount && (
         <Title>
-          There exist <b>{totalCount.total.toLocaleString()}</b> contents and
-          you already worked on <b>{totalCount.totalByUser.toLocaleString()}</b>{" "}
-          of them
+          There are already <b>{totalCount.total.toLocaleString()}</b> items and
+          you worked on <b>{totalCount.totalByUser.toLocaleString()}</b> of
+          them.
         </Title>
       )}
       <Flex>

diff --git a/client/src/common/Icon.tsx b/client/src/common/Icon.tsx
@@ -5,18 +5,16 @@ export type Props = React.SVGProps<SVGSVGElement> & {
   ref?: any;
 };
 
-const SVG = styled("svg")``;
-
 export default function Icon({ path, ...props }: Props) {
   return (
-    <SVG
+    <svg
       xmlns="http://www.w3.org/2000/svg"
       width="24"
       height="24"
       viewBox="0 0 24 24"
       {...props}
     >
       <path d={path} fill="currentColor" />
-    </SVG>
+    </svg>
   );
 }
diff --git a/client/src/common/icons.tsx b/client/src/common/icons.tsx
@@ -70,7 +70,7 @@ export const paths = {
 
 type Props = Partial<IconProps>;
 
-const icons: { [index: string]: React.ComponentType<Props> } = {};
+const icons: { [index: string]: React.FC<Props> } = {};
 
 Object.entries(paths).forEach(([name, path]) => {
   icons[name] = (props: Props) => <Icon {...props} path={path} />;

diff --git a/src/persistence/adapter/knex/KnexContent.ts b/src/persistence/adapter/knex/KnexContent.ts
@@ -130,7 +130,6 @@ export default class KnexContent implements ContentAdapter {
     models: Cotype.Model[],
     author: string
   ) {
-
     await this.testUniqueFields(model, models, storeData);
 
     const [id] = await this.knex("contents")
@@ -1463,7 +1462,8 @@ export default class KnexContent implements ContentAdapter {
         join.on("contents.latest_rev", "cr.rev");
       })
       .join("users", "users.id", "cr.author")
-      .whereIn("type", models);
+      .whereIn("type", models)
+      .andWhere("contents.deleted", false);
     if (user) {
       k.andWhere("cr.author", user);
     }
@@ -1503,7 +1503,8 @@ export default class KnexContent implements ContentAdapter {
         this.knex.raw("contents.published_rev")
       )
       .orWhere("contents.published_rev", null)
-      .whereIn("type", models);
+      .whereIn("type", models)
+      .andWhere("contents.deleted", false);
 
     const [count] = await k.clone().count("contents.id as total");
     const total = Number(count.total);