Merge branch 'master' into rtl-client

akiva10b · akiva10b · commit 2d0d58463ff1 · 2025-01-14T15:14:34.000+02:00
diff --git a/scripts/scheduled/metrics.py b/scripts/scheduled/metrics.py
@@ -21,10 +21,10 @@
 contributors = len(contributors)
 
 # Number of Links
-links = db.links.count()
+links = db.links.count_documents({})
 
 # Number of Source sheets
-sheets = db.sheets.count()
+sheets = db.sheets.count_documents({})
 
 metrics = {
     "timestamp": datetime.datetime.now().replace(hour=0, minute=0, second=0, microsecond=0),
@@ -37,6 +37,6 @@
 }
 
 try:
-    db.metrics.save(metrics)
+    db.metrics.insert_one(metrics)
 except DuplicateKeyError:
     pass
diff --git a/sefaria/model/text.py b/sefaria/model/text.py
@@ -1029,7 +1029,11 @@ class AbstractTextRecord(object):
 
     def word_count(self):
         """ Returns the number of words in this text """
-        return self.ja(remove_html=True).word_count()
+        try:
+            wc = self.ja(remove_html=True).word_count()
+        except AttributeError:
+            wc = 0
+        return wc
 
     def char_count(self):
         """ Returns the number of characters in this text """
diff --git a/sefaria/system/exceptions.py b/sefaria/system/exceptions.py
@@ -108,5 +108,5 @@ def __init__(self, book_ref):
                         f"'{book_ref}' is a \'complex\' book-level ref. We only support book-level "
                         f"refs in cases of texts with a 'simple' structure. To learn more about the "
                         f"structure of a text on Sefaria, "
-                        f"see: https://developers.sefaria.org/docs/the-schema-of-a-simple-text")
+                        f"see: https://developers.sefaria.org/docs/the-structure-of-a-simple-text")
         super().__init__(self.message)
diff --git a/static/js/NewsletterSignUpForm.jsx b/static/js/NewsletterSignUpForm.jsx
@@ -6,6 +6,7 @@ export function NewsletterSignUpForm({
                                          includeEducatorOption = true,
                                          emailPlaceholder = {en: 'Sign up for Newsletter', he: "הרשמו לניוזלטר"},
                                          subscribe=Sefaria.subscribeSefariaNewsletter,  // function which sends form data to API to subscribe
+                                         additionalNewsletterMailingLists = [],
                                      }) {
     const [email, setEmail] = useState('');
     const [firstName, setFirstName] = useState('');
@@ -24,15 +25,15 @@ export function NewsletterSignUpForm({
         if (showNameInputs === true) { // submit
             if (firstName.length > 0 && lastName.length > 0) {
                 setSubscribeMessage("Subscribing...");
-                subscribe(firstName, lastName, email, educatorCheck).then(res => {
+                subscribe(firstName, lastName, email, educatorCheck, additionalNewsletterMailingLists).then(res => {
                     setSubscribeMessage("Subscribed! Welcome to our list.");
                     Sefaria.track.event("Newsletter", "Subscribe from " + contextName, "");
                 }).catch(error => {
                     setSubscribeMessage(error?.message || "Sorry, there was an error.");
                     setShowNameInputs(false);
                 });
             } else {
-                setSubscribeMessage("Please enter a valid first and last name");// get he copy
+                setSubscribeMessage("Please enter a valid first and last name");
             }
         } else if (Sefaria.util.isValidEmailAddress(email)) {
             setShowNameInputs(true);
diff --git a/static/js/Promotions.jsx b/static/js/Promotions.jsx
@@ -4,6 +4,7 @@ import classNames from "classnames";
 import Sefaria from "./sefaria/sefaria";
 import {EnglishText, HebrewText, InterfaceText, OnInView} from "./Misc";
 import $ from "./sefaria/sefariaJquery";
+import { NewsletterSignUpForm } from "./NewsletterSignUpForm";
 
 const Promotions = () => {
   const [inAppAds, setInAppAds] = useState(Sefaria._inAppAds); // local cache
@@ -36,6 +37,11 @@ const Promotions = () => {
             buttonIcon: sidebarAd.buttonIcon,
             buttonLocation: sidebarAd.buttonAboveOrBelow,
             hasBlueBackground: sidebarAd.hasBlueBackground,
+            isNewsletterSubscriptionInputForm: sidebarAd.isNewsletterSubscriptionInputForm,
+            newsletterMailingLists:
+              sidebarAd.newsletterMailingLists?.data.map(
+                (mailingLists) => mailingLists.attributes.newsletterName
+              ) ?? [],
             trigger: {
               showTo: sidebarAd.showTo,
               interfaceLang: "english",
@@ -209,40 +215,47 @@ const SidebarAd = React.memo(({ context, matchingAd }) => {
     );
   }
 
-  return (
-    <OnInView onVisible={() => trackSidebarAdImpression(matchingAd)}>
-      <div className={classes}>
-        <h3
-          className={context.interfaceLang === "hebrew" ? "int-he" : "int-en"}
-        >
-          {matchingAd.title}
-        </h3>
-        {matchingAd.buttonLocation === "below" ? (
-          <>
-            <p
-              className={
-                context.interfaceLang === "hebrew" ? "int-he" : "int-en"
-              }
-            >
-              {matchingAd.bodyText}
-            </p>
-            {getButton()}
-          </>
-        ) : (
-          <>
-            {getButton()}
-            <p
-              className={
-                context.interfaceLang === "hebrew" ? "int-he" : "int-en"
-              }
-            >
-              {matchingAd.bodyText}
-            </p>
-          </>
-        )}
-      </div>
-    </OnInView>
-  );
+    const isHebrew = context.interfaceLang === "hebrew";
+    const getLanguageClass = () => (isHebrew ? "int-he" : "int-en");
+
+    return (
+      <OnInView onVisible={() => trackSidebarAdImpression(matchingAd)}>
+        <div className={classes}>
+          <h3 className={getLanguageClass()}>{matchingAd.title}</h3>
+          {matchingAd.buttonLocation === "below" ? (
+            matchingAd.isNewsletterSubscriptionInputForm ? (
+              <>
+                <p className={getLanguageClass()}>{matchingAd.bodyText}</p>
+                <NewsletterSignUpForm
+                  context={"Sidebar Ad: " + context.keywordTargets.toString()}
+                  includeEducatorOption={false}
+                  additionalNewsletterMailingLists={matchingAd.newsletterMailingLists}
+                />
+              </>
+            ) : (
+              <>
+                <p className={getLanguageClass()}>{matchingAd.bodyText}</p>
+                {getButton()}
+              </>
+            )
+          ) : matchingAd.isNewsletterSubscriptionInputForm ? (
+            <>
+              <NewsletterSignUpForm
+                context={"Sidebar Ad: " + context.keywordTargets.toString()}
+                includeEducatorOption={false}
+                additionalNewsletterMailingLists={matchingAd.newsletterMailingLists}
+              />
+              <p className={getLanguageClass()}>{matchingAd.bodyText}</p>
+            </>
+          ) : (
+            <>
+              {getButton()}
+              <p className={getLanguageClass()}>{matchingAd.bodyText}</p>
+            </>
+          )}
+        </div>
+      </OnInView>
+    );
 });
 
 export { Promotions, GDocAdvertBox };
diff --git a/static/js/context.js b/static/js/context.js
@@ -163,6 +163,14 @@ function StrapiDataProvider({ children }) {
                 showTo
                 startTime
                 updatedAt
+                isNewsletterSubscriptionInputForm
+                newsletterMailingLists {
+                  data {
+                    attributes {
+                      newsletterName
+                    }
+                  }
+                }
               }
             }
           }
diff --git a/static/js/sefaria/sefaria.js b/static/js/sefaria/sefaria.js
@@ -764,12 +764,13 @@ Sefaria = extend(Sefaria, {
       Sefaria._portals[portalSlug] = response;
       return response;
   },
-  subscribeSefariaNewsletter: async function(firstName, lastName, email, educatorCheck) {
+  subscribeSefariaNewsletter: async function(firstName, lastName, email, educatorCheck, lists = []) {
       const payload = {
         language: Sefaria.interfaceLang === "hebrew" ? "he" : "en",
         educator: educatorCheck,
         firstName: firstName,
         lastName: lastName,
+        ...(lists?.length && { lists }),
       };
       return await Sefaria.apiRequestWithBody(`/api/subscribe/${email}`, null, payload);
   },
diff --git a/static/js/sefaria/strings.js b/static/js/sefaria/strings.js
@@ -502,6 +502,7 @@ const Strings = {
     "Please enter a valid email address.": 'כתובת הדוא"ל שהוזנה אינה תקינה.',
     "Subscribed! Welcome to our list.": "הרשמה בוצעה בהצלחה!",
     "Sorry, there was an error.": "סליחה, ארעה שגיאה",
+    "Please enter a valid first and last name.": "נא להוסיף שם פרטי ושם משפחה.",
 
     // Footer
     "Connect": "צרו קשר",
diff --git a/static/js/sefaria/util.js b/static/js/sefaria/util.js
@@ -104,19 +104,6 @@ class Util {
         };
         const postData = {json: JSON.stringify(feedback)};
         $.post('/api/send_feedback', postData);
-    }
-     static subscribeToNbList(email, lists) {
-        if (Sefaria.util.isValidEmailAddress(email)) {
-            $.post("/api/subscribe/" + email + "?lists=" + lists, function(data) {
-                if ("error" in data) {
-                    console.log(data.error);
-                } else {
-                    console.log("Subscribed! Welcome to our list.");
-                }
-            }).error(data => console.log("Sorry, there was an error."));
-        } else {
-        console.log("not valid email address")
-        }
     }
     static naturalTimePlural(n, singular, plural) {
       return n <= 1 ? singular : plural;

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,14 @@ function StrapiDataProvider({ children }) {`
`163`	`163`	`showTo`
`164`	`164`	`startTime`
`165`	`165`	`updatedAt`
	`166`	`+ isNewsletterSubscriptionInputForm`
	`167`	`+ newsletterMailingLists {`
	`168`	`+ data {`
	`169`	`+ attributes {`
	`170`	`+ newsletterName`
	`171`	`+ }`
	`172`	`+ }`
	`173`	`+ }`
`166`	`174`	`}`
`167`	`175`	`}`
`168`	`176`	`}`