Merge branch 'develop'

sillsdev · Jan 24, 2023 · fcc8c31 · fcc8c31
2 parents 8697b9d + 63c18c4
commit fcc8c31
Show file tree

Hide file tree

Showing 68 changed files with 1,595 additions and 935 deletions.
diff --git a/.github/workflows/set-backlog-fields.yml b/.github/workflows/set-backlog-fields.yml
@@ -2,7 +2,7 @@ name: Add Issue to Project
 
 on:
   issues:
-    types: [ opened ]
+    types: [ opened, reopened ]
 
 jobs:
   add_issue_to_project:
@@ -30,7 +30,7 @@ jobs:
               repository(name:"web-languageforge", owner:$org) {
                 issue(number: $issue_number) {
                   id
-                  projectNextItems(first:100) {
+                  projectItems(first:100) {
                     nodes {
                       id
                     }
@@ -39,32 +39,35 @@ jobs:
               }
             }' -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
+          echo 'IN_PROJECT='$(jq '.data.repository.issue.projectItems[] | length' project_data.json) >> $GITHUB_ENV
 
       - name: get required info for set operations
         env:
           GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
           ORGANIZATION: sillsdev
         run: |
           gh api graphql -f query='
-            query($org: String!) {
-              organization(login: $org){
-                projectNext(number: 1) {
+            query ($org: String!) {
+              organization(login: $org) {
+                projectV2(number: 1) {
                   id
-                  fields(first:100) {
-                    nodes {
+                  field(name: "ProductOwner") {
+                    ... on ProjectV2SingleSelectField {
                       id
                       name
-                      settings
+                      options {
+                        id
+                        name
+                      }
                     }
                   }
                 }
               }
             }' -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== "ProductOwner") | .id' project_data.json) >> $GITHUB_ENV
-          echo 'INCOMING_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "ProductOwner") | .settings | fromjson.options[] | select(.name=="Incoming") | .id' project_data.json) >> $GITHUB_ENV
+          echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV
+          echo 'FIELD_ID='$(jq '.data.organization.projectV2.field.id' project_data.json) >> $GITHUB_ENV
+          echo 'INCOMING_ID='$(jq '.data.organization.projectV2.field.options[] | select(.name=="Incoming") | .id' project_data.json) >> $GITHUB_ENV
 
       - name: Add issue to project
         if: env.IN_PROJECT == 0
@@ -74,12 +77,12 @@ jobs:
         run: |
           item_id="$( gh api graphql -f query='
             mutation($project:ID!, $item:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $item}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $item}) {
+                item {
                   id
                 }
               }
-            }' -f project=$PROJECT_ID -f item=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+            }' -f project=$PROJECT_ID -f item=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')"
 
           echo 'ITEM_ID='$item_id >> $GITHUB_ENV
 
@@ -95,13 +98,17 @@ jobs:
               $field: ID!
               $field_value: String!)
             {
-              updateProjectNextItemField(input: {
+              updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $field
-                value: $field_value})
+                value: {
+                  singleSelectOptionId: $field_value
+                  }
+                }
+              )
               {
-                projectNextItem {
+                projectV2Item {
                   id
                 }
               }

diff --git a/Makefile b/Makefile
@@ -46,6 +46,10 @@ unit-tests-ci:
 .PHONY: build
 build:
 	npm install
+
+    # ensure we start with a clean ui-dist volume for every build
+	docker volume rm web-languageforge_lf-ui-dist 2>/dev/null
+
 	docker compose build mail app lfmerge ld-api next-proxy next-app
 
 .PHONY: scan

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -187,7 +187,7 @@ services:
       - SMTP_USERNAME=username
       - SMTP_PASSWORD=password
       - SERVER_HOSTNAME=nobody.localhost
-    command: sh -c "postconf -e 'default_transport = retry:no outbound email allowed' && /run.sh"
+    command: sh -c "postconf -e 'default_transport = discard' && /run.sh"
 
   db:
     image: mongo:6

diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile
@@ -38,7 +38,7 @@ RUN npm run build:${NPM_BUILD_SUFFIX}
 # COMPOSER-BUILDER
 # download composer app dependencies
 # git - needed for composer install
-FROM sillsdev/web-languageforge:base-php AS composer-builder
+FROM sillsdev/web-languageforge:base-php-7.4 AS composer-builder
 ENV COMPOSER_ALLOW_SUPERUSER=1
 RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* \
     && install-php-extensions @composer
@@ -47,15 +47,15 @@ COPY src/composer.json src/composer.lock /composer/
 RUN composer install
 
 # PRODUCTION IMAGE
-FROM sillsdev/web-languageforge:base-php AS production-app
+FROM sillsdev/web-languageforge:base-php-7.4 AS production-app
 RUN rm /usr/local/bin/install-php-extensions
 RUN apt-get remove -y gnupg2
 RUN mv $PHP_INI_DIR/php.ini-production $PHP_INI_DIR/php.ini
 # had to add /wait into prod image so the prod image could be run through E2E tests.
 COPY --from=sillsdev/web-languageforge:wait-latest /wait /wait
 
 # DEVELOPMENT IMAGE
-FROM sillsdev/web-languageforge:base-php AS development-app
+FROM sillsdev/web-languageforge:base-php-7.4 AS development-app
 RUN install-php-extensions xdebug-^3.1
 COPY docker/app/docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d
 RUN mv $PHP_INI_DIR/php.ini-development $PHP_INI_DIR/php.ini

diff --git a/docker/db/README.md b/docker/db/README.md
@@ -32,6 +32,19 @@
 
 `db.users.find()`
 
+```
+db.users.update(
+	{
+		email: '[email protected]'
+	},
+	{
+		$set: {
+			role: 'admin'
+		}
+	}
+)
+```
+
 # Test data
 
 ## Activity

diff --git a/docker/lfmerge/Dockerfile b/docker/lfmerge/Dockerfile
@@ -1,2 +1,2 @@
-FROM ghcr.io/sillsdev/lfmerge:2.0.131
+FROM ghcr.io/sillsdev/lfmerge:2.0.133
 # Do not add anything to this Dockerfile, it should stay empty
diff --git a/docker/test-php/Dockerfile b/docker/test-php/Dockerfile
@@ -1,4 +1,4 @@
-FROM sillsdev/web-languageforge:base-php
+FROM sillsdev/web-languageforge:base-php-7.4
 
 
 # ----- LINES BELOW COPIED FROM APP DOCKERFILE ----------