Merge branch 'develop'

Author: megahirt

.github/workflows/build-and-publish-adhoc.yml

@@ -18,6 +18,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
+      -
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.14.0'
+          cache: 'npm'
+      -
+        run: npm install
 
       - name: Build and tag app
         run: docker build -t ${{ env.IMAGE }}:${{ github.event.inputs.tag }} -f docker/app/Dockerfile .

.github/workflows/build-and-publish-npm-cache.yml

@@ -42,6 +42,13 @@ jobs:
         run: |
           echo ::set-output name=NAMESPACE::sillsdev/web-languageforge
           echo ::set-output name=TAG::${{ inputs.image-tag }}
+      -
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.14.0'
+          cache: 'npm'
+      -
+        run: npm install
       -
         name: Build app
         run: docker-compose build --build-arg ENVIRONMENT=production --build-arg BUILD_VERSION=${{ steps.image.outputs.TAG }} app

.github/workflows/integrate-and-deploy.yml

@@ -1,4 +1,4 @@
-name: Tests
+name: Build and Test
 
 # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#on
 on:
@@ -31,6 +31,22 @@ jobs:
           github_token: ${{ github.token }}
           files: docker/PhpUnitTests.xml
 
+  build-app:
+    runs-on: ubuntu-latest
+
+    steps:
+      -
+        uses: actions/checkout@v2
+      -
+        uses: actions/setup-node@v2
+        with:
+          node-version: '16.14.0'
+          cache: 'npm'
+      -
+        run: npm install
+      -
+        run: docker-compose build app
+
   # e2e-tests:
   #   runs-on: ubuntu-latest
 

.github/workflows/tests.yml renamed to .github/workflows/pull-request.yml

@@ -0,0 +1,103 @@
+name: Add Issue to Project
+
+on:
+  issues:
+    types: [ opened ]
+
+jobs:
+  steve:
+    if: ${{ !github.event.issue.pull_request }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Generate token
+        id: generate_token
+        uses: tibdex/github-app-token@7ce9ffdcdeb2ba82b01b51d6584a6a85872336d4
+        with:
+          app_id: ${{ secrets.LFPROJECTBOARDAUTOMATION_APP_ID }}
+          private_key: ${{ secrets.LFPROJECTBOARDAUTOMATION_PRIVATE_KEY }}
+          
+      - name: determine if issue is already on a project
+        env:
+          GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
+          ISSUE_NUMBER: ${{ github.event.issue.number }}
+          REPO: ${{ toJson(github.event.repository.name) }}
+          ORGANIZATION: sillsdev
+        run: |
+          echo issue $ISSUE_NUMBER added to $REPO
+          
+          gh api graphql -f query='
+            query($issue_number:Int!, $org:ID!) {
+              repository(name:"web-languageforge", owner:$org) {
+                issue(number: $issue_number) {
+                  id
+                  projectNextItems(first:100) {
+                    nodes {
+                      id
+                    }
+                  }
+                }
+              }
+            }' -F issue_number=$ISSUE_NUMBER -f org=$ORGANIZATION > project_data.json
+          
+          echo 'IN_PROJECT='$(jq '.data.repository.issue.projectNextItems[] | length' project_data.json) >> $GITHUB_ENV
+    
+      - name: get required info for set operations
+        run: |
+          gh api graphql -f query='
+            query($org: String!) {
+              organization(login: $org){
+                projectNext(number: 1) {
+                  id
+                  fields(first:100) {
+                    nodes {
+                      id
+                      name
+                      settings
+                    }
+                  }
+                }
+              }
+            }' -f org=$ORGANIZATION > project_data.json
+            
+          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
+          echo 'FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Backlog") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'TRIAGE_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Backlog") | .settings | fromjson.options[] | select(.name=="Triage") | .id' project_data.json) >> $GITHUB_ENV
+        
+      - name: Add issue to project
+        if: env.IN_PROJECT == 0
+        env:
+          ISSUE_ID: ${{ github.event.issue.node_id }} #use ITEM_ID instead for finding on projects
+        run: |
+          item_id="$( gh api graphql -f query='
+            mutation($project:ID!, $item:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $item}) {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f item=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          
+          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
+          
+      - name: set Backlog field
+        if: env.IN_PROJECT == 0
+        run: |
+          gh api graphql -f query='
+            mutation(
+              $project:ID!
+              $item:ID!
+              $field: ID!
+              $field_value: String!)
+            {
+              updateProjectNextItemField(input: {
+                projectId: $project
+                itemId: $item
+                fieldId: $field
+                value: $field_value})
+              {
+                projectNextItem {
+                  id
+                }
+              }
+            }' -f project=$PROJECT_ID -f item=$ITEM_ID -f field=$FIELD_ID -f field_value=${{ env.TRIAGE_ID }}
+            

.github/workflows/set-backlog-fields.yml

@@ -1,10 +1,14 @@
 PhpUnitTests.xml
 docker/e2e-results.xml
 src/assets/*
+src/dist/*
 !src/assets/.gitkeep
 src/cache/*
 !src/cache/.gitkeep
 test/php/\.phpunit\.result\.cache
 node_modules
 .DS_Store
 docker-scan-results.txt
+test-results/
+playwright-report/
+*storageState.json

.gitignore

@@ -7,6 +7,7 @@
       "request": "launch",
       "port": 9003,
       "pathMappings": {
+        "/var/www/html/Api/Service/TestControl.php": "${workspaceRoot}/test/e2e/TestControl.php",
         "/var/www/html/": "${workspaceRoot}/src/",
         "/var/www/test/": "${workspaceRoot}/test/"
       }

.vscode/launch.json

@@ -0,0 +1,20 @@
+
+## Ways to Contribute ##
+1. Look for issues in our issue tracker marked with *good first issue*
+2. If you are a Language Forge user, stay up to date with posts in our software community forum, and answer user's questions to the extent that you are able
+3. Help localize the Language Forge UI into a language that you are familiar with
+
+
+
+## Contributing Code ##
+### Typical Workflow ###
+1.  Create a branch off of `develop`
+1.  Create a PR back into `develop`
+1.  Once approved and merged, test those changes on [qa.languageforge.org](https://qa.languageforge.org)
+1.  Once you are satisfied with the changes, coordinate with the team to deliver those changes to the production environment
+1.  Team leads will determine when the right time to cut a release, i.e., tag and deploy, typically this should be within a day or two
+
+### Production Bugfix Workflow ###
+1.  There may be times when it's necessary to create a branch off of `master` (e.g. a hotfix for the production environment)
+1.  Coordinate with the team to deliver those changes to the production environment
+1.  Team leads will determine when the right time to cut a release, i.e., tag and deploy, this would likely be right away under these exceptional circumstances