Merge pull request #1630 from unfoldingWord/updateStage-1.16

Update master 1.16

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Problem Statement**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Proposed Solution**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.github/ISSUE_TEMPLATE/release-issue-template.md

@@ -0,0 +1,48 @@
+---
+name: Release issue template
+about: Steps to follow for Release process
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Feature: Original Scripture text on the right most position in scripture pane.
+#### Prepare Staging 
+- [ ] PR to remove RC from the version number
+  - start in new branch (e.g., `zpp-remove-rc-1.6`); 
+  - edit `package.json` for version (e.g., v*.*); commit; publish
+  - `git tag` (e.g., v*.*);    `git push --tags`
+  - create PR from `remove...` branch --> `develop`;  connect this PR to the "RELEASE" issue
+  - merge this PR (even if you merge it yourself, please use PR and do not commit directly to the develop branch)
+- [ ]  Release Branch:
+  - pull latest develop changes
+  - create new branch: release branch for version*.* from develop
+  - publish release branch to github
+- [ ] Create staging Netlify link (PROD Data)
+  - create new PR from `v*.*` --> `STAGE`; connect to the release issue
+  - walk through happy path on deploy preview
+  - merge 
+  - Monitor build: wait 20 minutes?  https://stage--tc-create-app.netlify.app/
+    Verify version & build number are updated.
+    (If the DEPLOY PREVIEW encountered NO errors, then STAGE should build fine.)
+#### QA Release and Staged 
+  - [ ]  Ping QA that release branch for version *.* is ready for testing  
+  - [ ] Release notes are drafted
+  - [ ] QA approves release notes
+  - [ ] QA gives go-ahead to release to production
+#### Release and Publish
+  - [ ] PR from release branch for version *.* to Master
+    - create new PR from `STAGE` --> `master`; connect to the release issue
+    - walk through happy path on deploy preview
+    - merge 
+    - Monitor build: wait 20 minutes?  
+       - https://app.netlify.com/sites/tc-create-app/deploys/
+       - https://create.translationcore.com/
+       - Verify version & build number are updated.
+          (If the DEPLOY PREVIEW encountered NO errors, then PROD should build fine.)
+  - [ ] Ping QA that production release is released
+  - [ ] Final Go ahead  from QA to notify the users of the new release
+  - [ ] tag release on Github v*.*
+  - [ ] publish release note
+  - [ ] Announce on forum.door43.org https://forum.door43.org/t/tc-create-1-x-release-notes/661

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tc-create-app",
   "homepage": "https://create.translationcore.com/",
-  "version": "1.15.1",
+  "version": "1.16",
   "license": "MIT",
   "private": false,
   "bugs": {
@@ -35,7 +35,7 @@
     "@material-ui/styles": "^4.11.3",
     "axios": "^0.21.0",
     "bible-reference-range": "^1.1.0",
-    "datatable-translatable": "1.2.2",
+    "datatable-translatable": "1.2.3",
     "dcs-branch-merger": "^1.3.0",
     "deep-freeze": "^0.0.1",
     "gitea-react-toolkit": "2.2.4",
@@ -48,7 +48,7 @@
     "react-icons": "^4.8.0",
     "react-select": "^4.1.0",
     "react-waypoint": "^10.1.0",
-    "scripture-resources-rcl": "5.5.5",
+    "scripture-resources-rcl": "5.5.6",
     "tc-ui-toolkit": "^5.3.3",
     "use-deep-compare": "^1.1.0",
     "use-deep-compare-effect": "^1.3.1",

public/build_number

@@ -1 +1 @@
-270-88dad83
+273-2ccee8b

src/components/translatable/helpers.js

@@ -138,15 +138,25 @@ export const columnsFilterFromColumnNames = ({ columnNames }) => {
 };
 
 export const columnsShowDefaultFromColumnNames = ({ columnNames }) => {
-  const columnNamesToUse = ['Question', 'Response', 'SupportReference', 'OccurrenceNote', 'OrigWords', 'TWLink', 'Note'];
-
-  const indices = columnNamesToUse.map(columnName => {
+  const retrievedData = (localStorage.getItem("StoredColumn"))
+  if (retrievedData){
+    const splitString = retrievedData.split(',');
+    const columnNamesToUse = [...splitString];
+    const indices = columnNamesToUse.map(columnName => {
     const index = columnIndexOfColumnNameFromColumnNames({ columnNames, columnName });
-    return index;
-  });
-
-  const columnsIndices = indices.filter(index => (index > -1));
-  const columnsShowDefault = columnsIndices.map(index => (columnNames[index]));
-
-  return columnsShowDefault;
+      return index;
+    });
+    const columnsIndices = indices.filter(index => (index > -1));
+    const columnsShowDefault = columnsIndices.map(index => (columnNames[index]));
+      return columnsShowDefault;
+  }else{
+    const columnNamesToUse = [];
+    const indices = columnNamesToUse.map(columnName => {
+    const index = columnIndexOfColumnNameFromColumnNames({ columnNames, columnName });
+      return index;
+    });
+    const columnsIndices = indices.filter(index => (index > -1));
+    const columnsShowDefault = columnsIndices.map(index => (columnNames[index]));
+      return columnsShowDefault;
+  }
 };

yarn.lock

@@ -5727,10 +5727,10 @@ data-urls@^1.0.0, data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
-[email protected].2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.2.tgz#cb12c862db592219c3450c2f97d59f76797fb8fe"
-  integrity sha512-TH/Ribv+P4Qs+3VhMcZYBHZgpRAfJGX++E3GYckJRyjZU4C6WWU/SmzvNdThXwkVXAFJvBP32yHPJ/ZLS2/Kaw==
+[email protected].3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/datatable-translatable/-/datatable-translatable-1.2.3.tgz#f8d32c1f0da9a2b66662eca2983ea9d88185aca8"
+  integrity sha512-QT+JAKq5QfA+bGkrwFO5rMoTKaJ34/mGlMzKX3q2ILK7QdWYg5vP2Xq28iroAa5Fpu/Ka8tlCBIlFtYJwtygrA==
   dependencies:
     deep-freeze "^0.0.1"
     extensible-rcl "^1.1.0"
@@ -15426,10 +15426,10 @@ schema-utils@^3.0.0:
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
-[email protected].5:
-  version "5.5.5"
-  resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.5.tgz#6fd6d05614be05b053abaf98236e9d701ae18299"
-  integrity sha512-GE22R5/PVai4xHPMvH6ITpXbIdGLTpXIk7BJODzLjkdxxZjKASyunynCsIWR8bg6oSdPL1i5zR1pdw1Zx9Vm0A==
+[email protected].6:
+  version "5.5.6"
+  resolved "https://registry.yarnpkg.com/scripture-resources-rcl/-/scripture-resources-rcl-5.5.6.tgz#d8d81e346f680d5b29c1aa6ec1e64f2d3627e32b"
+  integrity sha512-buJGDTyiLtKr0rO2YxHvSZQzmRKufbhH3ghtoZ4FxzOHBNpWvYT6S3CGTLLoaiObkxplNl9ga/or9vAy1+Ixsw==
   dependencies:
     bible-reference-range "^1.1.0"
     deep-freeze "^0.0.1"