Integration tests topics org crud (#72)

* Integration tests for orgs and topics * Fix group type * Fix build * Fix build * feat: add schemas for all entities * feat: implement all fields for resources and datasets * feat: review scehmas for organization and geography * fix: validation for units * fix: indexing for the topics field * feat: index contributors * feat: update the example env to include schema-related env vars * feat: add documentation * fix: documentation image * feat: custom SOLR schema * feat: update prod Dockerfile to have all dependencies * feat: add geography_shape field to the geography custom group * feat: upgrade TDC plugin version * fix: tests * feat: make extension versions fixed * clean: clean dockerfiles * setup dataset browse page * fix review issues * fix filters y space * Update search.tsx * fix badges cound * fix: units field throwing error * feat: upgrade live deployment to fix units field bug * Integration tests for orgs and topics --------- Co-authored-by: Demenech <[email protected]> Co-authored-by: William Lima <[email protected]>
transport-data · Sep 11, 2024 · 6d1b3a3 · 6d1b3a3
1 parent 7fac660
commit 6d1b3a3
Show file tree

Hide file tree

Showing 20 changed files with 278 additions and 425 deletions.
diff --git a/frontend/markdown.db b/frontend/markdown.db
diff --git a/frontend/src/components/group/CreateGroupForm.tsx b/frontend/src/components/group/CreateGroupForm.tsx
@@ -13,6 +13,7 @@ import Spinner from "@components/_shared/Spinner";
 import notify from "@utils/notify";
 import { Form } from "@components/ui/form";
 import { slugify } from "@lib/utils";
+import { toast } from "@/components/ui/use-toast";
 
 export const CreateGroupForm: React.FC = () => {
   const router = useRouter();
@@ -30,7 +31,9 @@ export const CreateGroupForm: React.FC = () => {
   const utils = api.useContext();
   const createGroup = api.group.create.useMutation({
     onSuccess: async () => {
-      notify(`Successfully created the ${groupCreated} topic`);
+      toast({
+        description: `Successfully created the ${groupCreated} topic`,
+      });
       formObj.reset();
       setErrorMessage(null);
       await utils.group.list.invalidate();

diff --git a/frontend/src/components/group/EditGroupForm.tsx b/frontend/src/components/group/EditGroupForm.tsx
@@ -12,11 +12,14 @@ import { match } from "ts-pattern";
 import Spinner from "@components/_shared/Spinner";
 import notify from "@utils/notify";
 import { Form } from "@components/ui/form";
+import { toast } from "@/components/ui/use-toast";
+import { useRouter } from "next/router";
 
 export const EditGroupForm: React.FC<{
   initialValues: Group;
 }> = ({ initialValues }) => {
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const router = useRouter();
   const [groupEdited, setGroupEdited] = useState("");
   const formObj = useForm<GroupFormType>({
     resolver: zodResolver(GroupSchema),
@@ -26,9 +29,12 @@ export const EditGroupForm: React.FC<{
   const utils = api.useContext();
   const editGroup = api.group.patch.useMutation({
     onSuccess: async () => {
-      notify(`Successfully edited the ${groupEdited} group`);
+      toast({
+        description: `Successfully edited the ${groupEdited} topic`,
+      });
       setErrorMessage(null);
       await utils.group.list.invalidate();
+      await router.push("/dashboard/topics");
     },
     onError: (error) => setErrorMessage(error.message),
   });
@@ -46,18 +52,12 @@ export const EditGroupForm: React.FC<{
         <div className="col-span-full">
           {match(editGroup.isLoading)
             .with(false, () => (
-              <Button
-                type="submit"
-                className="mt-8 w-full py-4"
-              >
+              <Button type="submit" className="mt-8 w-full py-4">
                 Edit Topic
               </Button>
             ))
             .otherwise(() => (
-              <Button
-                type="submit"
-                className="mt-8 flex w-full py-4"
-              >
+              <Button type="submit" className="mt-8 flex w-full py-4">
                 <Spinner className="hover:text-slate-900" />
                 Edit Topic
               </Button>

diff --git a/frontend/src/components/groups/GroupCard.tsx b/frontend/src/components/groups/GroupCard.tsx
@@ -16,25 +16,19 @@ export default function GroupCard({
 }: GroupCardProps) {
   const url = image_display_url ? new URL(image_display_url) : undefined;
   return (
-    <div className="bg-white p-8 col-span-3 rounded-lg h-full shadow-lg">
+    <div className="col-span-3 h-full rounded-lg bg-white p-8 shadow-lg">
       <Image
-        src={
-          image_display_url &&
-          url &&
-          getConfig().publicRuntimeConfig.DOMAINS.includes(url.hostname)
-            ? image_display_url
-            : "/images/logos/DefaultOrgLogo.svg"
-        }
+        src={image_display_url}
         alt={`${name}-collection`}
         width="43"
         height="43"
       ></Image>
-      <h3 className="font-inter font-semibold text-lg mt-4">{display_name}</h3>
-      <p className="font-inter font-medium text-sm mt-1 mb-6 line-clamp-2">
+      <h3 className="font-inter mt-4 text-lg font-semibold">{display_name}</h3>
+      <p className="font-inter mb-6 mt-1 line-clamp-2 text-sm font-medium">
         {description}
       </p>
       <Link href={`/groups/${name}`}>
-        <span className="font-inter font-medium text-sm text-accent cursor-pointer">
+        <span className="font-inter cursor-pointer text-sm font-medium text-accent">
           View -&gt;
         </span>
       </Link>

diff --git a/frontend/src/components/groups/individualPage/GroupInfo.tsx b/frontend/src/components/groups/individualPage/GroupInfo.tsx
@@ -13,11 +13,8 @@ export default function GroupInfo({ group }: { group: Group }) {
         width={120}
         height={120}
         src={
-          group.image_display_url &&
-          url &&
-          getConfig().publicRuntimeConfig.DOMAINS.includes(url.hostname)
-            ? group.image_display_url
-            : "/images/logos/DefaultGroupLogo.svg"
+          group.image_display_url
+            ?? "/images/logos/DefaultGroupLogo.svg"
         }
         alt={`${group.name}-collection`}
       />

diff --git a/frontend/src/components/organization/CreateOrganizationForm.tsx b/frontend/src/components/organization/CreateOrganizationForm.tsx
@@ -16,6 +16,7 @@ import Spinner from "@components/_shared/Spinner";
 import notify from "@utils/notify";
 import { Form } from "@components/ui/form";
 import { slugify } from "@lib/utils";
+import { toast } from "@/components/ui/use-toast";
 
 export const CreateOrganizationForm: React.FC = () => {
   const router = useRouter();
@@ -33,7 +34,9 @@ export const CreateOrganizationForm: React.FC = () => {
   const utils = api.useContext();
   const createOrganization = api.organization.create.useMutation({
     onSuccess: async () => {
-      notify(`Successfully created the ${organizationCreated} organization`);
+      toast({
+        description: `Successfully created the ${organizationCreated} organization`,
+      });
       formObj.reset();
       setErrorMessage(null);
       await utils.organization.list.invalidate();

diff --git a/frontend/src/components/organization/EditOrganizationForm.tsx b/frontend/src/components/organization/EditOrganizationForm.tsx
@@ -15,6 +15,7 @@ import { match } from "ts-pattern";
 import Spinner from "@components/_shared/Spinner";
 import { useRouter } from "next/router";
 import notify from "@utils/notify";
+import { toast } from "@/components/ui/use-toast";
 import { Form } from "@components/ui/form";
 
 export const EditOrganizationForm: React.FC<{
@@ -31,7 +32,9 @@ export const EditOrganizationForm: React.FC<{
   const utils = api.useContext();
   const editOrganization = api.organization.patch.useMutation({
     onSuccess: async () => {
-      notify(`Successfully edited the ${organizationEdited} organization`);
+      toast({
+        description: `Successfully edited the ${organizationEdited} organization`,
+      });
       setErrorMessage(null);
       await utils.organization.list.invalidate();
       await utils.organization.listForUser.invalidate();

diff --git a/frontend/src/components/organization/OrgCard.tsx b/frontend/src/components/organization/OrgCard.tsx
@@ -16,25 +16,19 @@ export default function GroupCard({
 }: OrgCardProps) {
   const url = image_display_url ? new URL(image_display_url) : undefined;
   return (
-    <div className="bg-white p-8 col-span-3 rounded-lg h-full shadow-lg">
+    <div className="col-span-3 h-full rounded-lg bg-white p-8 shadow-lg">
       <Image
-        src={
-          image_display_url &&
-          url &&
-          getConfig().publicRuntimeConfig.DOMAINS.includes(url.hostname)
-            ? image_display_url
-            : "/images/logos/DefaultOrgLogo.svg"
-        }
+        src={image_display_url ?? "/images/logos/DefaultOrgLogo.svg"}
         alt={`${name}-collection`}
         width="43"
         height="43"
       ></Image>
-      <h3 className="font-inter font-semibold text-lg mt-4">{display_name}</h3>
-      <p className="font-inter font-medium text-sm mt-1 mb-6 line-clamp-2">
+      <h3 className="font-inter mt-4 text-lg font-semibold">{display_name}</h3>
+      <p className="font-inter mb-6 mt-1 line-clamp-2 text-sm font-medium">
         {description}
       </p>
       <Link href={`/@${name}`}>
-        <span className="font-inter font-medium text-sm text-accent cursor-pointer">
+        <span className="font-inter cursor-pointer text-sm font-medium text-accent">
           View -&gt;
         </span>
       </Link>

diff --git a/frontend/src/components/organization/individualPage/OrgInfo.tsx b/frontend/src/components/organization/individualPage/OrgInfo.tsx
@@ -14,25 +14,19 @@ export default function OrgInfo({ org }: { org: Organization }) {
         <Image
           width={120}
           height={120}
-          src={
-            org.image_display_url &&
-            url &&
-            getConfig().publicRuntimeConfig.DOMAINS.includes(url.hostname)
-              ? org.image_display_url
-              : "/images/logos/DefaultOrgLogo.svg"
-          }
+          src={org.image_display_url ?? "/images/logos/DefaultOrgLogo.svg"}
           alt={`${org.name}-collection`}
         />
       </div>
-      <div className="flex flex-col gap-y-3 mt-8">
-        <span className="font-medium text-gray-500 inline">
+      <div className="mt-8 flex flex-col gap-y-3">
+        <span className="inline font-medium text-gray-500">
           <svg
             xmlns="http://www.w3.org/2000/svg"
             fill="none"
             viewBox="0 0 24 24"
             strokeWidth={1.5}
             stroke="currentColor"
-            className="w-5 h-5 text-accent inline mr-1"
+            className="mr-1 inline h-5 w-5 text-accent"
           >
             <path
               strokeLinecap="round"
@@ -42,14 +36,14 @@ export default function OrgInfo({ org }: { org: Organization }) {
           </svg>
           Packages: {org.packages ? org.packages.length : 0}
         </span>
-        <span className="font-medium text-gray-500 inline">
+        <span className="inline font-medium text-gray-500">
           <svg
             xmlns="http://www.w3.org/2000/svg"
             fill="none"
             viewBox="0 0 24 24"
             strokeWidth={1.5}
             stroke="currentColor"
-            className="w-5 h-5 text-accent inline mr-1"
+            className="mr-1 inline h-5 w-5 text-accent"
           >
             <path
               strokeLinecap="round"
@@ -60,15 +54,15 @@ export default function OrgInfo({ org }: { org: Organization }) {
           Created: {org.created && format(org.created)}
         </span>
       </div>
-      <div className="py-4 my-4 border-y">
-        <p className="text-sm font-normal text-stone-500 line-clamp-4">
+      <div className="my-4 border-y py-4">
+        <p className="line-clamp-4 text-sm font-normal text-stone-500">
           {org.description?.replace(/<\/?[^>]+(>|$)/g, "") || "No description"}
         </p>
       </div>
       <div className="flex flex-wrap gap-1">
         {org.tags?.map((tag: Tag) => (
           <span
-            className="bg-accent px-4 py-1 rounded-full text-white"
+            className="rounded-full bg-accent px-4 py-1 text-white"
             key={tag.id}
           >
             {tag.display_name}

diff --git a/frontend/src/env.mjs b/frontend/src/env.mjs
@@ -24,6 +24,9 @@ export const env = createEnv({
     R2_ACCESS_KEY_ID: z.string(),
     R2_SECRET_KEY_ID: z.string(),
     SYS_ADMIN_API_KEY: z.string(),
+    MATOMO_AUTH_KEY: z.string(),
+    MATOMO_URL: z.string(),
+    MATOMO_SITE_ID: z.string(),
   },
 
   /**
@@ -53,6 +56,9 @@ export const env = createEnv({
     NEXT_PUBLIC_R2_PUBLIC_URL: process.env.NEXT_PUBLIC_R2_PUBLIC_URL,
     NEXT_PUBLIC_CKAN_URL: process.env.NEXT_PUBLIC_CKAN_URL,
     NEXT_PUBLIC_PUBLIC_PORTAL_URL: process.env.NEXT_PUBLIC_PUBLIC_PORTAL_URL,
+    MATOMO_AUTH_KEY: process.env.MATOMO_AUTH_KEY,
+    MATOMO_URL: process.env.MATOMO_URL,
+    MATOMO_SITE_ID: process.env.MATOMO_SITE_ID,
   },
   /**
    * Run `build` or `dev` with `SKIP_ENV_VALIDATION` to skip env validation.

diff --git a/frontend/src/pages/[org]/[dataset]/index.tsx b/frontend/src/pages/[org]/[dataset]/index.tsx
@@ -23,6 +23,7 @@ import {
   SelectValue,
 } from "@components/ui/select";
 import useMatomoTracker from "@lib/useMatomoTracker";
+import { api } from "@utils/api";
 
 const siteTitle = "TDC Data Portal";
 const backend_url = env.NEXT_PUBLIC_CKAN_URL;
@@ -107,6 +108,8 @@ export default function DatasetPage({
       label: `${dataset.organization?.title || dataset.organizatio?.name}`,
     },
   ];
+  const matomo = api.matomo.getVisitorStats.useQuery()
+  console.log(matomo.data)
   return (
     <>
       <Head>

diff --git a/frontend/src/server/api/root.ts b/frontend/src/server/api/root.ts
@@ -6,6 +6,7 @@ import { resourceRouter } from "./routers/resource";
 import { userRouter } from "./routers/user";
 import { datapackageRouter } from "./routers/datapackage";
 import { uploadsRouter } from "./routers/uploads";
+import { matomoRouter } from "./routers/matomo";
 
 /**
  * This is the primary router for your server.
@@ -20,6 +21,7 @@ export const appRouter = createTRPCRouter({
   organization: organizationRouter,
   uploads: uploadsRouter,
   datapackage: datapackageRouter,
+  matomo: matomoRouter 
 });
 
 // export type definition of API

diff --git a/frontend/src/server/api/routers/group.ts b/frontend/src/server/api/routers/group.ts
@@ -5,7 +5,7 @@ import {
   deleteGroups,
   listGroups,
   patchGroup,
-  getGroup
+  getGroup,
 } from "@utils/group";
 import { z } from "zod";
 
@@ -29,7 +29,8 @@ export const groupRouter = createTRPCRouter({
     .mutation(async ({ input, ctx }) => {
       const user = ctx.session.user;
       const apiKey = user.apikey;
-      const group = await createGroup({ apiKey, input });
+      const _group = { ...input, type: "topic" };
+      const group = await createGroup({ apiKey, input: _group });
       return group;
     }),
   patch: protectedProcedure

diff --git a/frontend/src/server/api/routers/matomo.ts b/frontend/src/server/api/routers/matomo.ts
@@ -0,0 +1,29 @@
+import {
+  createTRPCRouter,
+  protectedProcedure,
+  publicProcedure,
+} from "@/server/api/trpc";
+import { env } from "@/env.mjs";
+import { z } from "zod";
+import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
+import { GetObjectCommand } from "@aws-sdk/client-s3";
+import r2 from "@/server/r2";
+
+export const matomoRouter = createTRPCRouter({
+  getVisitorStats: publicProcedure.query(async ({ input }) => {
+    const matomoApiUrl = `${env.MATOMO_URL}/index.php`;
+    const params = {
+      module: "API",
+      method: "Actions.getPageUrls",
+      idSite: env.MATOMO_SITE_ID,
+      period: "day",
+      date: "today",
+      format: "JSON",
+      token_auth: env.MATOMO_AUTH_KEY,
+    };
+    const urlParams = new URLSearchParams(params).toString();
+    const response = await fetch(`${matomoApiUrl}?${urlParams}`);
+    const data = await response.json();
+    return data;
+  }),
+});