Merge pull request #111 from unfoldingWord/bug-cn-1047-tr-mode-use-release-filelist

Translators use released filelist

Author: ancientTexts-net

.gitignore

@@ -34,4 +34,5 @@ cypress.env.json
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-/.yalc
+/.yalc
+yalc.lock

src/components/file/File.context.js

@@ -22,6 +22,7 @@ export function FileContextProvider({
   onLoadCache,
   onSaveCache,
   onConfirmClose,
+  releaseFlag,
 }) {
   const { state: contextAuthentication } = useContext(AuthenticationContext);
   const { state: contextRepository, config: contextConfig } = useContext(RepositoryContext);
@@ -33,7 +34,7 @@ export function FileContextProvider({
     authentication: _authentication || contextAuthentication,
     repository: _repository || contextRepository,
     filepath, onFilepath, defaultContent, create, onOpenValidation, onConfirmClose,
-    onLoadCache, onSaveCache,
+    onLoadCache, onSaveCache, releaseFlag,
   });
 
   const context = {
@@ -92,4 +93,5 @@ FileContextProvider.propTypes = {
     PropTypes.arrayOf(PropTypes.node),
     PropTypes.node,
   ]).isRequired,
+  releaseFlag: PropTypes.bool,
 };

src/components/file/useFile.js

@@ -25,6 +25,7 @@ function useFile({
   onLoadCache,
   onSaveCache,
   onConfirmClose,
+  releaseFlag,
 }) {
   const [file, setFile] = useState();
   const [isChanged, setIsChanged] = useState(false);
@@ -34,7 +35,6 @@ function useFile({
 
   const config = _config || repositoryConfig;
   const branch = repository && (repository.branch || repository.default_branch);
-
   const [deleted, setDeleted] = useState();
 
   const _setBlob = useCallback((_blob) => {
@@ -51,7 +51,7 @@ function useFile({
   const {
     state: blobState, actions: blobActions, components: blobComponents,
   } = useBlob({
-    blob, onBlob: _setBlob, config, repository, filepath,
+    blob, onBlob: _setBlob, config, repository, filepath, releaseFlag,
   });
 
   const { push: writeable } = (repository && repository.permissions) ? repository.permissions : {};

src/components/tree-blob/useBlob.js

@@ -14,11 +14,17 @@ function useBlob({
   // filepath, TODO: use filepath to pre-select blob;
   tree,
   url: _url,
+  releaseFlag,
 }) {
   const blob = __blob && deepFreeze(__blob);
 
-  const url = _url || (repository && repository.tree_url);
-
+  let url = _url || (repository && repository.tree_url);
+  console.log("releaseFlag?",releaseFlag);
+  if ( releaseFlag && repository?.catalog?.prod?.branch_or_tag_name ) {
+    // p.replace(regex, 'ferret')
+    url = url.replace(/master$/,repository.catalog.prod.branch_or_tag_name);
+  }
+  console.log("url=",url);
   const update = useCallback((_blob) => {
     if (onBlob) {
       onBlob(_blob);