Merge branch 'master' into 8937-myachievements-loading-issue

Author: dogi

.github/workflows/planet-db.yml

@@ -1,6 +1,6 @@
 name: Planet DB-Init Builder
 
-on: 
+on:
   push:
     branches-ignore:
       - l10n_i18n
@@ -41,14 +41,11 @@ jobs:
       matrix:
         include:
           - arch: amd64
-            dockerfile: ./docker/db-init/Dockerfile
-            build_args: ""
+            base_image: treehouses/node:3.18
           - arch: arm
-            dockerfile: ./docker/db-init/crosscompile-Dockerfile
-            build_args: "--build-arg RUNTIME_IMAGE=treehouses/node-tags:arm --build-arg CROSSCOMPILE_ARCH=armv7"
+            base_image: treehouses/node-tags:arm-3.18
           - arch: arm64
-            dockerfile: ./docker/db-init/crosscompile-Dockerfile
-            build_args: "--build-arg RUNTIME_IMAGE=treehouses/node-tags:arm64 --build-arg CROSSCOMPILE_ARCH=armv8"
+            base_image: treehouses/node-tags:arm64-3.18
 
     steps:
       - name: Checkout Code
@@ -62,9 +59,11 @@ jobs:
           BRANCH="${GITHUB_REF_NAME//\//-}"
           repo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$BRANCH-${GITHUB_SHA::8}"
           branchrepo="$DOCKER_ORG/$DOCKER_REPO_TAG:${{ matrix.arch }}-db-init-$PLANET_VERSION-$BRANCH"
-          build_args="${{ matrix.build_args }}"
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-          docker build -f '${{ matrix.dockerfile }}' $build_args -t $repo .
+          docker build \
+            -f './docker/db-init/Dockerfile' \
+            --build-arg BASE_IMAGE='${{ matrix.base_image }}' \
+            -t $repo .
           docker images
           docker tag $repo $branchrepo
           docker push $repo

chatapi/package.json

@@ -44,9 +44,9 @@
   },
   "devDependencies": {
     "@types/node": "^20.3.1",
-    "@typescript-eslint/eslint-plugin": "^5.60.0",
-    "@typescript-eslint/parser": "^5.60.0",
-    "eslint": "^8.43.0",
+    "@typescript-eslint/eslint-plugin": "~5.60.0",
+    "@typescript-eslint/parser": "~5.60.0",
+    "eslint": "~8.43.0",
     "nodemon": "^2.0.22"
   }
 }

couchdb-setup.sh

@@ -18,13 +18,6 @@ upsert_doc() {
   fi
 }
 
-# Function for insert mock data docs
-insert_docs() {
-  DB=$1
-  DOC_LOC=$2
-  curl -H 'Content-Type: application/json' -X POST $COUCHURL/$DB/_bulk_docs -d @$DOC_LOC $PROXYHEADER
-}
-
 # Function to add databases
 insert_dbs() {
   DBS=$1
@@ -68,25 +61,6 @@ else
   COUCHURL=http://$COUCHUSER:$COUCHPASSWORD@$HOST:$PORT
 fi
 
-# Adding attachments to database documents
-# To add attachment added two file (resources-mock.json and resources-attachment-mockup.json)
-# Ids must match between two files
-insert_attachments() {
-  DB=$1
-  DOC_LOC=$2
-  # Use echo $(<$DOC_LOC) to be able to run in Windows
-  INPUTS=$(echo $(<$DOC_LOC) | jq -c '.[]')
-  for i in $INPUTS
-  do
-    ID=$(echo $i | jq -r '.doc_id' )
-    FILE_NAME=$(echo $i | jq -r '.file_name')
-    FILE_LOCATION=$(echo $i | jq -r '.file_location')
-    FILE_TYPE=$(echo $i | jq -r '.file_type')
-    REV=$(curl $COUCHURL/$DB/$ID | jq -r '._rev' $PROXYHEADER)
-    curl -X PUT $COUCHURL/$DB/$ID/$FILE_NAME?rev=$REV --data-binary @$FILE_LOCATION -H Content-Type:$FILE_TYPE $PROXYHEADER
-  done
-}
-
 # Reads one JSON file to update multiple databases
 # JSON file needs a 'dbName' field with a string and
 # a 'json' field with the JSON to be updated

docker/db-init/Dockerfile

@@ -1,12 +1,12 @@
-FROM treehouses/node
+ARG BASE_IMAGE=treehouses/node:3.18
+
+FROM ${BASE_IMAGE}
 LABEL maintainer="dogi@ole.org,mutugiii@ole.org"
 
 RUN apk update \
     && apk add --no-cache bash curl git jq ca-certificates
 
-RUN npm config set unsafe-perm true \
-    && npm install -g add-cors-to-couchdb \
-    && npm config set unsafe-perm false
+RUN npm install -g add-cors-to-couchdb
 
 WORKDIR /root
 

docker/db-init/crosscompile-Dockerfile

@@ -3,8 +3,8 @@
   "license": "AGPL-3.0",
   "version": "0.22.76",
   "myplanet": {
-    "latest": "v0.53.68",
-    "min": "v0.51.90"
+    "latest": "v0.54.91",
+    "min": "v0.52.45"
   },
   "scripts": {
     "ng": "ng",
@@ -25,13 +25,13 @@
   "private": true,
   "dependencies": {
     "@angular/animations": "19.2.20",
-    "@angular/cdk": "^19.2.19",
+    "@angular/cdk": "19.2.19",
     "@angular/common": "19.2.20",
     "@angular/compiler": "19.2.20",
     "@angular/core": "19.2.20",
     "@angular/forms": "19.2.20",
-    "@angular/localize": "^19.2.20",
-    "@angular/material": "^19.2.19",
+    "@angular/localize": "19.2.20",
+    "@angular/material": "19.2.19",
     "@angular/platform-browser": "19.2.20",
     "@angular/platform-browser-dynamic": "19.2.20",
     "@angular/platform-server": "19.2.20",
@@ -62,13 +62,13 @@
     "zone.js": "~0.15.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^19.2.22",
+    "@angular-devkit/build-angular": "19.2.22",
     "@angular-eslint/builder": "19.8.1",
     "@angular-eslint/eslint-plugin": "19.8.1",
     "@angular-eslint/eslint-plugin-template": "19.8.1",
     "@angular-eslint/schematics": "19.8.1",
     "@angular-eslint/template-parser": "19.8.1",
-    "@angular/cli": "^19.2.22",
+    "@angular/cli": "19.2.22",
     "@angular/compiler-cli": "19.2.20",
     "@angular/language-service": "19.2.20",
     "@eslint/compat": "^1.4.1",

docker/db-init/crosscompile_db-init.sh

@@ -258,7 +258,7 @@ export class ChatWindowComponent implements OnInit, OnDestroy, AfterViewInit {
 
   submitPrompt() {
     const content = this.promptForm.controls.prompt.value;
-    this.data = { ...this.data, content, aiProvider: this.provider };
+    this.data = { ...this.data, content, aiProvider: this.provider, assistant: this.provider?.name === 'openai' };
 
     this.chatService.setChatAIProvider(this.data.aiProvider);
     this.setSelectedConversation();

package.json

@@ -92,7 +92,7 @@
           <span i18n>Send Courses</span>
           <span *ngIf="selectedLocal > 0"> ({{selectedLocal}})</span>
         </button>
-        <button *ngIf="planetType !== 'community'" mat-menu-item (click)="openSendCourseDialog()" [disabled]="!selection.selected.length">
+        <button *ngIf="planetType !== 'community'" mat-menu-item (click)="openSendCourseDialog()" [disabled]="!selection.selected.length || dialogGuard.isActive('send-course')">
           <mat-icon aria-hidden="true" class="margin-lr-3" >compare_arrows</mat-icon>
           <span i18n>Push To {planetType, select, center {Nation} other {Community}}</span>
           <span *ngIf="selection?.selected?.length"> ({{selection?.selected?.length}})</span>

src/app/chat/chat-window/chat-window.component.ts

@@ -10,7 +10,7 @@ import { SelectionModel } from '@angular/cdk/collections';
 import { Router, ActivatedRoute, RouterLink } from '@angular/router';
 import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { Subject, of } from 'rxjs';
-import { switchMap, takeUntil } from 'rxjs/operators';
+import { map, switchMap, takeUntil } from 'rxjs/operators';
 import { FuzzySearchService } from '../shared/fuzzy-search.service';
 import {
   filterSpecificFields, composeFilterFunctions, createDeleteArray, filterTags,
@@ -29,6 +29,7 @@ import { CoursesService } from './courses.service';
 import { dedupeShelfReduce, doesMarkdownPreviewTruncate, findByIdInArray, hasMarkdownImages, itemsShown } from '../shared/utils';
 import { StateService } from '../shared/state.service';
 import { DialogsLoadingService } from '../shared/dialogs/dialogs-loading.service';
+import { DialogGuardService } from '../shared/dialogs/dialog-guard.service';
 import { TagsService } from '../shared/forms/tags.service';
 import { PlanetTagInputComponent } from '../shared/forms/planet-tag-input.component';
 import { SearchService } from '../shared/forms/search.service';
@@ -95,7 +96,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
   @Input() displayedColumns = [ 'select', 'courseTitle', 'info', 'createdDate', 'rating' ];
   @Input() excludeIds = [];
   @Input() includeIds: string[] = [];
-  dialogRef: MatDialogRef<DialogsListComponent>;
+  dialogRef: MatDialogRef<DialogsListComponent> | null = null;
   message = '';
   deleteDialog: any;
   readonly dbName = 'courses';
@@ -163,6 +164,7 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
     private syncService: SyncService,
     private stateService: StateService,
     private dialogsLoadingService: DialogsLoadingService,
+    public dialogGuard: DialogGuardService,
     private tagsService: TagsService,
     private searchService: SearchService,
     private deviceInfoService: DeviceInfoService,
@@ -470,17 +472,19 @@ export class CoursesComponent implements OnInit, OnChanges, AfterViewInit, OnDes
   }
 
   openSendCourseDialog() {
-    this.dialogsListService.getListAndColumns('communityregistrationrequests', { 'registrationRequest': 'accepted' }).pipe(
-      takeUntil(this.onDestroy$)
-    ).subscribe((planet) => {
-      const data = { okClick: this.sendCourse().bind(this),
-        filterPredicate: filterSpecificFields([ 'name' ]),
-        allowMulti: true,
-        ...planet };
-      this.dialogRef = this.dialog.open(DialogsListComponent, {
-        data, maxHeight: '500px', width: '600px', autoFocus: false
-      });
-    });
+    this.dialogGuard.open('send-course', () =>
+      this.dialogsListService.getListAndColumns('communityregistrationrequests', { 'registrationRequest': 'accepted' }).pipe(
+        map(planet => this.dialog.open(DialogsListComponent, {
+          data: {
+            okClick: this.sendCourse().bind(this),
+            filterPredicate: filterSpecificFields([ 'name' ]),
+            allowMulti: true,
+            ...planet
+          },
+          maxHeight: '500px', width: '600px', autoFocus: false
+        }))
+      )
+    ).pipe(takeUntil(this.onDestroy$)).subscribe(ref => this.dialogRef = ref);
   }
 
   sendCourse() {