Merge pull request #180 from novaforgood/dev

Deploy prod

hasura/.gitignore

@@ -1 +1,2 @@
-.env
+.env
+/db_data

hasura/metadata/databases/mentorcenter/tables/public_public_space.yaml

@@ -5,18 +5,18 @@ select_permissions:
   - role: public
     permission:
       columns:
+        - deleted
+        - domainWhitelist
         - name
         - slug
         - id
-      filter:
-        deleted:
-          _eq: false
+      filter: {}
   - role: user
     permission:
       columns:
+        - id
         - name
         - slug
-        - id
-      filter:
-        deleted:
-          _eq: false
+        - deleted
+        - domainWhitelist
+      filter: {}

hasura/migrations/mentorcenter/1692689421764_add_domain_whitelist_to_public_view/down.sql

@@ -0,0 +1,11 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- DROP VIEW "public"."public_space";
+--
+-- CREATE OR REPLACE VIEW "public"."public_space" AS
+--  SELECT space.id,
+--     space.name,
+--     space.slug,
+--     space.deleted,
+--     space.attributes->>'domainWhitelist' as "domainWhitelist"
+--    FROM space;

hasura/migrations/mentorcenter/1692689421764_add_domain_whitelist_to_public_view/up.sql

@@ -0,0 +1,9 @@
+DROP VIEW "public"."public_space";
+
+CREATE OR REPLACE VIEW "public"."public_space" AS 
+ SELECT space.id,
+    space.name,
+    space.slug,
+    space.deleted,
+    space.attributes->>'domainWhitelist' as "domainWhitelist"
+   FROM space;

mobile/src/lib/gql/from-shared/hasura.graphql

@@ -289,6 +289,13 @@ query ProfileListingsInSpace($where: profile_listing_bool_exp) {
         first_name
         email
       }
+      profile_listing {
+        id
+        profile_listing_responses {
+          id
+          response_html
+        }
+      }
     }
   }
 }
@@ -656,6 +663,7 @@ query PublicSpaceBySlug($slug: String!) {
   public_space(where: { slug: { _eq: $slug } }) {
     id
     name
+    domainWhitelist
     slug
   }
 }

shared/graphql/hasura.graphql

@@ -289,6 +289,13 @@ query ProfileListingsInSpace($where: profile_listing_bool_exp) {
         first_name
         email
       }
+      profile_listing {
+        id
+        profile_listing_responses {
+          id
+          response_html
+        }
+      }
     }
   }
 }
@@ -656,6 +663,7 @@ query PublicSpaceBySlug($slug: String!) {
   public_space(where: { slug: { _eq: $slug } }) {
     id
     name
+    domainWhitelist
     slug
   }
 }

web/components/admin/SetPrivacySettings.tsx

@@ -67,6 +67,7 @@ export function SetPrivacySettings() {
           });
         }}
       />
+
       <div className="h-8"></div>
       <Button
         disabled={!mustSave}

web/components/space-homepage/SpaceLandingPage.tsx

@@ -2,12 +2,14 @@ import { useMemo, useState } from "react";
 
 import { closestCenter, DndContext, MeasuringStrategy } from "@dnd-kit/core";
 import { rectSortingStrategy, SortableContext } from "@dnd-kit/sortable";
-import { getDayOfYear } from "date-fns";
+import { addDays, format, getDayOfYear } from "date-fns";
 import Fuse from "fuse.js";
 import { useAtom } from "jotai";
 import Link from "next/link";
 import { useRouter } from "next/router";
 
+import { useProfileByIdQuery } from "../../generated/graphql";
+import { useAllProfilesOfUserQuery } from "../../generated/graphql";
 import {
   Profile_Role_Enum,
   useProfileListingsInSpaceQuery,
@@ -16,6 +18,7 @@ import { useCurrentProfile } from "../../hooks/useCurrentProfile";
 import { useCurrentSpace } from "../../hooks/useCurrentSpace";
 import { usePrivacySettings } from "../../hooks/usePrivacySettings";
 import { useQueryParam } from "../../hooks/useQueryParam";
+import { useUserData } from "../../hooks/useUserData";
 import {
   adminBypassAtom,
   searchQueryAtom,
@@ -28,6 +31,38 @@ import { ProfileCard } from "../ProfileCard";
 
 import { FilterBar } from "./FilterBar";
 
+const todayDateString = format(addDays(new Date(), 4), "yyyy-MM-dd");
+
+class SeededRNG {
+  seed: number;
+  constructor(seed = 123456789) {
+    this.seed = seed;
+  }
+
+  nextFloat() {
+    this.seed = (this.seed * 16807) % 2147483647;
+    return (this.seed - 1) / 2147483646;
+  }
+}
+
+// Convert an array of strings to a number
+function arrayToSeed(arr: string[]) {
+  let hash = 0;
+  const string = arr.join(",");
+  for (let i = 0; i < string.length; i++) {
+    const char = string.charCodeAt(i);
+    hash = (hash << 5) - hash + char;
+    hash |= 0; // Convert to 32bit integer
+  }
+  return Math.abs(hash);
+}
+
+function generateRandomVal(arr: string[]) {
+  const seed = arrayToSeed(arr);
+  const rng = new SeededRNG(seed);
+  return rng.nextFloat();
+}
+
 const FUSE_OPTIONS = {
   // isCaseSensitive: false,
   // includeScore: false,
@@ -106,7 +141,7 @@ export function SpaceLandingPage() {
     });
 
   const allProfileListings = useMemo(
-    () => profileListingData?.profile_listing ?? [],
+    () => [...(profileListingData?.profile_listing ?? [])],
     [profileListingData?.profile_listing]
   );
 
@@ -116,10 +151,77 @@ export function SpaceLandingPage() {
 
     const searchQueryLower = searchQuery.toLowerCase();
     const fuse = new Fuse(allProfileListings, FUSE_OPTIONS);
-
     return fuse.search(searchQueryLower).map((result) => result.item);
   }, [allProfileListings, searchQuery]);
 
+  const { userData } = useUserData();
+  const [{ data: profileData }] = useAllProfilesOfUserQuery({
+    variables: { user_id: userData?.id ?? "" },
+  });
+
+  // const idsToProfileScores = useMemo(() => {
+  //   let tempCounter = 0;
+  //   const tempIdsToProfileScores = new Map();
+
+  //   for (let i = 0; i < filteredProfileListings.length; i++) {
+  //     const profileListing =
+  //       filteredProfileListings[i]?.profile?.profile_listing;
+
+  //     if (profileListing && profileListing.profile_listing_responses) {
+  //       for (
+  //         let j = 0;
+  //         j < profileListing.profile_listing_responses?.length;
+  //         j++
+  //       ) {
+  //         const response = profileListing.profile_listing_responses[j];
+  //         if (response && response.response_html) {
+  //           const responseArray = response.response_html.split(" ");
+
+  //           if (responseArray.length >= 10) {
+  //             tempCounter += 4;
+  //           } else if (responseArray.length >= 1) {
+  //             tempCounter += 2;
+  //           }
+  //         }
+  //       }
+  //     }
+
+  //     const profileHeadline = filteredProfileListings[i]?.headline;
+  //     if (profileHeadline && profileHeadline.length > 0) {
+  //       const headlineArray = profileHeadline.split(" ");
+
+  //       if (headlineArray.length >= 3) {
+  //         tempCounter += 5;
+  //       } else if (headlineArray.length >= 1) {
+  //         tempCounter += 3;
+  //       }
+  //     }
+
+  //     if (filteredProfileListings[i].profile_listing_image != null) {
+  //       tempCounter += 10;
+  //     }
+
+  //     tempCounter +=
+  //       15 *
+  //       generateRandomVal([
+  //         todayDateString,
+  //         filteredProfileListings[i]?.id ?? "",
+  //       ]);
+  //     tempIdsToProfileScores.set(filteredProfileListings[i].id, tempCounter);
+  //     tempCounter = 0;
+  //   }
+  //   return tempIdsToProfileScores;
+  // }, [filteredProfileListings]);
+
+  // const sortedProfileListings = filteredProfileListings.sort((a, b) => {
+  //   if (idsToProfileScores.get(a.id) > idsToProfileScores.get(b.id)) {
+  //     return -1;
+  //   } else {
+  //     return 1;
+  //   }
+  // });
+  const sortedProfileListings = filteredProfileListings;
+
   const [adminBypass, setAdminBypass] = useAtom(adminBypassAtom);
 
   return (
@@ -177,17 +279,18 @@ export function SpaceLandingPage() {
             }}
           >
             <SortableContext
-              items={filteredProfileListings}
+              items={sortedProfileListings}
               strategy={rectSortingStrategy}
             >
-              {filteredProfileListings.map((listing, idx) => {
+              {sortedProfileListings.map((listing, idx) => {
                 const fullName = getFullNameOfUser(listing.profile.user);
 
                 const sortedTags = listing.profile_listing_to_space_tags
                   .map((tag) => tag.space_tag)
                   .sort((a, b) => {
                     const aSelected = selectedTagIdsSet.has(a.id);
                     const bSelected = selectedTagIdsSet.has(b.id);
+
                     if (aSelected && !bSelected) return -1;
                     if (!aSelected && bSelected) return 1;
                     return 0;