Merge branch 'develop'

Author: megahirt

.github/pull_request_template.md

@@ -30,12 +30,9 @@ Please provide screenshots / animations for any change that involves the UI. Ple
 
 Please describe how to test and/or verify your changes. Provide instructions so we can reproduce. Please also provide relevant test data as necessary. These instructions will be used for QA testing below.
 
-- [ ] Test A
-- [ ] Test B
+- Test A
+- Test B
 
 ## qa.languageforge.org testing
 
-Testers: Check the box and put in a date/time to sign-off/attest the feature works as expected on qa.languageforge.org
-
-- [ ] Tester1 (YYYY-MM-DD HH:MM)
-- [ ] Tester2 (YYYY-MM-DD HH:MM)
+Testers should add his/her findings to end of the PR in a comment and include screenshots, files, etc that are beneficial.

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

@@ -13,13 +13,13 @@ jobs:
       IMAGE: sillsdev/web-languageforge:base-php
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Build and tag base image
         run: docker build -t ${{ env.IMAGE }} -f docker/base-php/Dockerfile .
 
       - name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}

.github/workflows/build-and-publish-base-php.yml

@@ -34,7 +34,7 @@ jobs:
 
     steps:
       -
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         run: |
           docker --version
@@ -43,17 +43,18 @@ jobs:
         name: Establish image name
         id: image
         run: |
-          echo ::set-output name=NAMESPACE::sillsdev/web-languageforge
-          echo ::set-output name=TAG_APP::${{ inputs.image-tag-app }}
-          echo ::set-output name=TAG_PROXY::${{ inputs.image-tag-proxy }}
-          echo ::set-output name=TAG_NEXT_APP::${{ inputs.image-tag-next-app }}
-          echo ::set-output name=LFMERGE_NAMESPACE::ghcr.io/sillsdev/lfmerge
+          echo "NAMESPACE=sillsdev/web-languageforge" >> $GITHUB_OUTPUT
+          echo "TAG_APP=${{ inputs.image-tag-app }}" >> $GITHUB_OUTPUT
+          echo "TAG_PROXY=${{ inputs.image-tag-proxy }}" >> $GITHUB_OUTPUT
+          echo "TAG_NEXT_APP=${{ inputs.image-tag-next-app }}" >> $GITHUB_OUTPUT
+          echo "LFMERGE_NAMESPACE=ghcr.io/sillsdev/lfmerge" >> $GITHUB_OUTPUT
+
           # Get LfMerge tag from Dockerfile, fallback to "latest" as default if that fails
           TAG_LFMERGE=$(head -n 1 docker/lfmerge/Dockerfile | cut -d: -f2)
           TAG_LFMERGE=${TAG_LFMERGE:-latest}
-          echo ::set-output name=TAG_LFMERGE::${TAG_LFMERGE}
+          echo "TAG_LFMERGE=${TAG_LFMERGE}" >> $GITHUB_OUTPUT
       -
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.14.0'
           cache: 'npm'
@@ -78,7 +79,7 @@ jobs:
       #     npx playwright test
       -
         name: Log in to Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.image-repo-username }}
           password: ${{ secrets.image-repo-password }}

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

@@ -17,37 +17,34 @@ jobs:
 
     steps:
       -
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
         name: Unit Tests
         run: make unit-tests-ci
       -
         name: Publish Test Results
-        uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v1
+        uses: docker://ghcr.io/enricomi/publish-unit-test-result-action:v2
         if: always()
         with:
           check_name: Unit Test Results
           github_token: ${{ github.token }}
-          files: PhpUnitTests.xml
+          junit_files: PhpUnitTests.xml
 
   build-app-run-e2e-tests:
     runs-on: ubuntu-latest
 
     steps:
       -
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16.14.0'
           cache: 'npm'
       -
         name: Get installed Playwright version
         id: playwright-version
-        # https://github.com/microsoft/playwright/issues/7249#issuecomment-1201476980
-        run: echo -n "::set-output name=version::$(npm ls @playwright/test --json | jq --raw-output '.dependencies["@playwright/test"].version')"
-
-        # https://github.com/microsoft/playwright/issues/7249#issuecomment-1154603556
+        run: echo -n "version=$(npm ls @playwright/test --json | jq --raw-output '.version')" >> $GITHUB_OUTPUT
       -
         name: Cache playwright browsers
         uses: actions/cache@v3
@@ -67,7 +64,7 @@ jobs:
       -
         name: Upload test results
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: test-results
           path: test-results
@@ -76,9 +73,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       -
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       -
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "16.14.0"
           cache: "npm"
@@ -91,7 +88,7 @@ jobs:
 
   #   steps:
   #     -
-  #       uses: actions/checkout@v2
+  #       uses: actions/checkout@v3
   #     -
   #       name: Build app
   #       run: make build

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

@@ -81,7 +81,7 @@ clean:
 
 .PHONY: clean-powerwash
 clean-powerwash: clean
+	npx rimraf *storageState.json test-results
 	docker system prune -f --volumes
-	docker rmi -f `docker images -q "lf-*"`
-	docker image rm sillsdev/web-languageforge:base-php
+	- docker rmi -f `docker images -q "lf-*"` sillsdev/web-languageforge:base-php
 	docker builder prune -f

.github/workflows/pull-request.yml

@@ -191,7 +191,7 @@ services:
     command: sh -c "postconf -e 'default_transport = retry:no outbound email allowed' && /run.sh"
 
   db:
-    image: mongo:4.2
+    image: mongo:4.4
     container_name: lf-db
     ports:
       # exposed this to host for admin tools
@@ -248,8 +248,8 @@ services:
       dockerfile: docker/test-e2e/Dockerfile
       args:
         - ENVIRONMENT=development
-    image: test-e2e
-    container_name: test-e2e
+    image: lf-test-e2e
+    container_name: lf-test-e2e
     depends_on:
       - db
       - app-for-e2e
@@ -276,8 +276,8 @@ services:
   app-for-e2e:
     build:
       dockerfile: docker/app-for-e2e/Dockerfile
-    image: app-for-e2e
-    container_name: app-for-e2e
+    image: lf-app-for-e2e
+    container_name: lf-app-for-e2e
     platform: linux/amd64
     depends_on:
       - db
@@ -333,8 +333,8 @@ services:
   test-php:
     build:
       dockerfile: docker/test-php/Dockerfile
-    image: test-php
-    container_name: test-php
+    image: lf-test-php
+    container_name: lf-test-php
     depends_on:
       - db
       - mail

Makefile

@@ -49,7 +49,7 @@ spec:
     spec:
       containers:
       - name: db
-        image: mongo:4.2
+        image: mongo:4.4
         # https://kubernetes.io/docs/concepts/configuration/manage-resources-containers
         resources:
           requests:

docker-compose.yml

@@ -31,7 +31,7 @@
                             <span>My Projects</span>
                             <i class="fa fa-bars"></i>
                         </a>
-                        <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu id="myProjectDropdownMenu" aria-labelledby="myProjectDropdown">
+                        <div class="dropdown-menu dropdown-menu-right" uib-dropdown-menu id="myProjectDropdownMenu" aria-labelledby="myProjectDropdown" style="max-height: 80vh; overflow-y: auto">
                             {% verbatim %}
                             <div data-ng-switch="$ctrl.projectTypesBySite().length" data-ng-show="$ctrl.rights.canCreateProject">
                                 <div data-ng-switch-when="1">

docker/deployment/db-deployment.yaml

@@ -6,19 +6,6 @@
             <option value="">(no default)</option>
         </select>
     </div>
-    <div class="row">
-        <div class="col-12 clearfix">
-            <div class="input-group">
-               <input class="form-control" id="new-value" data-ng-model="$ctrl.newValue" data-on-enter="$ctrl.pickAddItem()" name="newValue"
-                      type="text" placeholder="new value" no-dirty-check>
-                <span class="input-group-btn">
-                    <a class="btn btn-primary add-item-to-list" href data-ng-click="$ctrl.pickAddItem()">
-                        <i class="fa fa-plus iconPadding" aria-hidden="true"></i>Add to List</a>
-                </span>
-            </div>
-        </div>
-    </div>
-    <br>
     <div class="row">
         <div class="col-12 clearfix" drag-to-reorder-bind="$ctrl.items">
             <div data-ng-repeat="item in $ctrl.items" class="picklist-group" dtr-draggable>

src/Site/views/languageforge/container/languageforge.html.twig

@@ -25,14 +25,6 @@ export class PickListEditorController implements angular.IController {
     }
   }
 
-  pickAddItem(): void {
-    if (this.newValue) {
-      const key = PickListEditorController.keyFromValue(this.newValue);
-      this.items.push({ key, value: this.newValue });
-      this.isDeletable[key] = true;
-      this.newValue = undefined;
-    }
-  }
 
   pickRemoveItem(index: number): void {
     delete this.isDeletable[this.items[index].key];

src/angular-app/bellows/shared/pick-list-editor.component.html

@@ -167,29 +167,16 @@ export class LexiconAppController implements angular.IController {
       (document.querySelectorAll('nav.navbar-expand')[1] as HTMLElement).style.backgroundColor = backgroundColorB;
     }
 
-    let offlineMessageId: string;
     Offline.on('up', () => {
       setTitle('Language Forge', '', '');
 
-      if (this.online === false) {
-        this.notice.removeById(offlineMessageId);
-        this.notice.push(this.notice.SUCCESS, 'You are back online!');
-      }
 
-      this.online = true;
       this.$scope.$digest();
     });
 
     Offline.on('down', () => {
       setTitle('Language Forge Offline', '#555', '#777');
-      offlineMessageId = this.notice.push(this.notice.ERROR, 'You are offline. Some features are not available', null,
-        true, 5 * 1000);
-      this.online = false;
-      if (!/^\/editor\//.test(this.$location.path())) {
         // redirect to the editor
-        this.$location.path('/editor');
-        this.notice.push(this.notice.SUCCESS, 'The dictionary editor is available offline.  Settings are not.');
-      }
 
       this.$scope.$digest();
     });

src/angular-app/bellows/shared/pick-list-editor.module.ts

@@ -18,7 +18,9 @@
     <div class="col-md-9">
         <div class="card card-body bg-light settings-panel" id="picklistEditorFieldset">
             <h3 class="col-form-label">{{$ctrl.olcOptionListsDirty[$ctrl.currentListIndex].name}}</h3>
-            <i>(At this time {{$ctrl.olcOptionListsDirty[$ctrl.currentListIndex].name}} items cannot be deleted)</i>
+            <div style="padding: 10px">
+                <small>To add or remove items from this list, please use FieldWorks (FLEx).</small>
+            </div>
             <div class="controls">
                 <picklist-editor items="$ctrl.olcOptionListsDirty[$ctrl.currentListIndex].items"></picklist-editor>
             </div>