Merge branch 'rtl-client' of https://github.com/Sefaria/Sefaria-Project into rtl-client

Author: akiva10b

sefaria/model/text_reuqest_adapter.py

@@ -193,6 +193,7 @@ def make_named_entities_dict():
             version['text'] = ja.modify_by_function(composite_func)
 
     def get_versions_for_query(self) -> dict:
+        self.oref = self.oref.default_child_ref()
         for lang, vtitle in self.versions_params:
             self._append_required_versions(lang, vtitle)
         self._add_ref_data_to_return_obj()

static/css/s2.css

@@ -1527,7 +1527,8 @@ div.interfaceLinks-row a {
 .readerPanel.english .contentSpan.primary,
 .readerPanel.english .languageToggle .he,
 .readerPanel.hebrew .contentSpan.translation,
-.readerPanel.hebrew .languageToggle .en {
+.readerPanel.hebrew .languageToggle .en,
+.readerPanel.hebrew .en .englishAvailableTag {
   display: none;
 }
 .readerPanel.english .versionsTextList .primary,

static/js/ConnectionsPanel.jsx

@@ -1269,17 +1269,18 @@ WebPagesList.propTypes = {
 const AdvancedToolsList = ({srefs, canEditText, currVersions, setConnectionsMode, masterPanelLanguage, toggleSignUpModal}) => {
     const {textsData} = useContext(ReaderPanelContext);
     const editText = canEditText && textsData ? function () {
-      const {primaryLang, translationLang} = textsData;
       let refString = srefs[0];
-      let currentPath = Sefaria.util.currentPath();
-      const language =  (masterPanelLanguage === 'english') ? translationLang : primaryLang;
-      const langCode = language.slice(0, 2);
-      const currVersionsLangCode = masterPanelLanguage.slice(0, 2);
+      const {primaryDirection, translationDirection} = textsData;
+      const currVersionsLangCode = masterPanelLanguage.slice(0,2);
       const versionTitle = currVersions[currVersionsLangCode]?.versionTitle;
+      const direction = (masterPanelLanguage === 'english') ? translationDirection : primaryDirection;
+      const langCode = direction === 'rtl' ? 'he': 'en';
       if (versionTitle) {
         refString += "/" + encodeURIComponent(langCode) + "/" + encodeURIComponent(versionTitle);
       }
+
       let path = "/edit/" + refString;
+      let currentPath = Sefaria.util.currentPath();
       let nextParam = "?next=" + encodeURIComponent(currentPath);
       path += nextParam;
       //console.log(path);

static/js/NavSidebar.jsx

@@ -92,8 +92,10 @@ const RecentlyViewedItem = ({oref}) => {
    const trackItem = () => {
      gtag('event', 'recently_viewed', {link_text: oref.ref, link_type: 'ref'})
    }
+   const params = Sefaria.util.getUrlVersionsParams(oref.versions);
+   const url = "/" + Sefaria.normRef(oref.ref) + (params ? "?" + params  : "");
    return <li>
-            <a href={oref.ref} onClick={() => trackItem()}>{Sefaria._v({"he": oref.he_ref, "en": oref.ref})}</a>
+            <a href={url} onClick={() => trackItem()}>{Sefaria._v({"he": oref.he_ref, "en": oref.ref})}</a>
          </li>;
 }
 const RecentlyViewedList = ({items}) => {

static/js/TextList.jsx

@@ -50,7 +50,7 @@ class TextList extends Component {
   }
   getSectionRef() {
     var ref = this.props.srefs[0]; // TODO account for selections spanning sections
-    var sectionRef = Sefaria.sectionRef(ref) || ref;
+    var sectionRef = Sefaria.sectionRef(ref, true) || ref;
     return sectionRef;
   }
   loadConnections() {

static/js/TextRange.jsx

@@ -590,12 +590,13 @@ class TextSegment extends Component {
     he = this.props.formatHeAsPoetry ? this.addPoetrySpans(he) : he
 
     const hasNoTranslation = !this.props.en;
+    const hasNoPrimarry = !this.props.he; //when connectionsMode is 'Translation Open' there is no he
 
     const hasOnlyRtl = (hasNoTranslation && this.props?.primaryDirection === 'rtl');
     const hasOnlyLtr = hasNoTranslation && this.props?.primaryDirection === 'ltr';
     let sidebarRtl, sidebarLtr;
     if (panelMode === 'Connections') {
-      const directionAttr = (language === 'hebrew') ? 'primaryDirection' : 'translationDirection';
+      const directionAttr = (language === 'hebrew' && !hasNoPrimarry) ? 'primaryDirection' : 'translationDirection';
       const direction = this.props?.[directionAttr];
       sidebarRtl = direction === 'rtl';
       sidebarLtr = direction === 'ltr';
@@ -633,7 +634,7 @@ class TextSegment extends Component {
       direction: this.props.primaryDirection,
       text: he + " ",
     } : {};
-    const shouldTranslationShow = language !== 'hebrew';
+    const shouldTranslationShow = language !== 'hebrew' || hasNoPrimarry;
     const translation = shouldTranslationShow ? {
       direction: this.props.translationDirection,
       text: en + " ",

static/js/sefaria/sefaria.js

@@ -548,10 +548,12 @@ Sefaria = extend(Sefaria, {
     const versions = requiredVersions.map(obj =>
         Sefaria.makeParamsStringForAPIV3(obj.languageFamilyName, obj.versionTitle)
     );
+    versions.sort();
+
     const mergeTextInt = mergeText ? 1 : 0;
     const return_format_string = (return_format) ? `&return_format=${return_format}` : '';
-    versions.sort();
-    const url = `${host}${endPoint}${ref}?version=${versions.join('&version=')}&fill_in_missing_segments=${mergeTextInt}${return_format_string}`;
+    const encodedRef = Sefaria.normRef(ref);
+    const url = `${host}${endPoint}${encodedRef}?version=${versions.join('&version=')}&fill_in_missing_segments=${mergeTextInt}${return_format_string}`;
     return url;
   },
   _textsStore: {},
@@ -2529,7 +2531,7 @@ _media: {},
       //This is temporary for RTL - we check savedVersion?.[key] for old data and savedVersion?.[key]?.versionTitle for new data
       //also we currently don't check the languageFamilyName to fit old data
       const savedVersionTitle = savedVersion?.[key]?.versionTitle ?? savedVersion?.[key] ?? '';
-      const currVersionTitle = currVersion?.[key]?.versionTitle ?? '';
+      const currVersionTitle = currVersion?.[key]?.versionTitle ?? currVersion?.[key] ?? '';
       return savedVersionTitle === currVersionTitle;
     }
     return checkEquality("en") && checkEquality("he");