bump from KSI (#14) (#15)

* bump from KSI (#14)

* feat(admin): allow sending emails

* feat(admin): tasks wave filtering

* feat(admin): discussion per tasks

* feat(admin): achievements list

* chore: increase angular budget

* feat(admin): instance config

* fix(edulint): dedupe requests

* fix(edulint): new api format

* fix(admin): do not redirect while caching

* fix(admin): temporarily disable achievements

* feat(module-programming): show edulint messages directly

* chore: disable sandboxed autodeploy

* fix: set text color in sortable item (fi-ksi#99)

* fix(tasks): refresh waves on login

* feat(docker): build

* feat(docker): auto-publish

---------

Co-authored-by: Jozef Steinhübl <[email protected]>

* patch(docker): cotainer name

---------

Co-authored-by: Jozef Steinhübl <[email protected]>

Author: esoadamo

.docker/rewrite.conf

@@ -0,0 +1,4 @@
+server.modules += ( "mod_rewrite" )
+
+url.rewrite-if-not-file = ( "" => "/" )
+server.error-handler-404 = "/index.html"

.github/workflows/build-docker.yml

@@ -0,0 +1,33 @@
+name: Docker Compose Build and Push
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build_and_push:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Check out the repository, including submodules
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          path: web
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push Docker images
+        working-directory: ./web
+        run: |
+          npm install
+          npm run build.docker
+          docker compose push

Dockerfile

@@ -0,0 +1,4 @@
+FROM rtsp/lighttpd
+ADD .docker/rewrite.conf /etc/lighttpd/conf.d/14-rewrite.conf
+ADD dist/web-frontend-angular/cs /var/www/html
+RUN chown -R lighttpd /var/www/html

angular.json

@@ -48,6 +48,31 @@
             "ngswConfigPath": "ngsw-config.json"
           },
           "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "60kb"
+                }
+              ],
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                },
+                {
+                  "replace": "src/routes/routes.ts",
+                  "with": "src/routes/routes.cs.ts"
+                }
+              ],
+              "outputHashing": "all"
+            },
             "pubdev": {
               "buildOptimizer": false,
               "optimization": false,

docker-compose.yml

@@ -0,0 +1,9 @@
+version: '3.8'
+
+services:
+  ksi-fe-dev-local:
+    container_name: naskoc-fe-local
+    image: fi-ksi/naskoc-fe-local
+    build: .
+    ports:
+      - "4201:80"

package.json

@@ -6,7 +6,9 @@
     "start.pubdev": "ng serve --configuration pubdev",
     "start.proxy": "ng serve --configuration proxy",
     "start": "ng serve",
+    "start.docker": "npm run build.docker && docker compose up",
     "build": "npm run gen.changelog && ng build",
+    "build.docker": "npm run build && docker compose build",
     "build.pubdev": "npm run gen.changelog && ng build --configuration pubdev",
     "build.prod": "npm run gen.changelog && ng build --configuration production && cp src/matomo/prod.js dist/web-frontend-angular/*/assets/scripts/matomo.js && cp -r src/cgi-bin/ dist/web-frontend-angular/cgi-bin/",
     "watch": "ng build --watch --configuration development",

src/api/backend/api/default.service.ts

@@ -22,6 +22,8 @@ import { AchievementGrantRequest } from '../model/achievementGrantRequest';
 import { AchievementGrantResponse } from '../model/achievementGrantResponse';
 import { AchievementResponse } from '../model/achievementResponse';
 import { AchievementsResponse } from '../model/achievementsResponse';
+import { AdminInstanceConfig } from '../model/adminInstanceConfig';
+import { AdminInstanceConfigResponse } from '../model/adminInstanceConfigResponse';
 import { AdminTaskCreationRequest } from '../model/adminTaskCreationRequest';
 import { AdminTaskDeployResponse } from '../model/adminTaskDeployResponse';
 import { AdminTaskMergeResponse } from '../model/adminTaskMergeResponse';
@@ -2969,6 +2971,105 @@ export class DefaultService {
         );
     }
 
+    /**
+     * 
+     * 
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public instanceConfigGetAll(observe?: 'body', reportProgress?: boolean): Observable<AdminInstanceConfigResponse>;
+    public instanceConfigGetAll(observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<AdminInstanceConfigResponse>>;
+    public instanceConfigGetAll(observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<AdminInstanceConfigResponse>>;
+    public instanceConfigGetAll(observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        let headers = this.defaultHeaders;
+
+        // authentication (ksi) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+        ];
+
+        return this.httpClient.request<AdminInstanceConfigResponse>('get',`${this.basePath}/admin/instanceConfig`,
+            {
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
+    /**
+     * 
+     * 
+     * @param body 
+     * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
+     * @param reportProgress flag to report request and response progress.
+     */
+    public instanceConfigSetSingle(body: AdminInstanceConfig, observe?: 'body', reportProgress?: boolean): Observable<string>;
+    public instanceConfigSetSingle(body: AdminInstanceConfig, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<string>>;
+    public instanceConfigSetSingle(body: AdminInstanceConfig, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<string>>;
+    public instanceConfigSetSingle(body: AdminInstanceConfig, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+
+        if (body === null || body === undefined) {
+            throw new Error('Required parameter body was null or undefined when calling instanceConfigSetSingle.');
+        }
+
+        let headers = this.defaultHeaders;
+
+        // authentication (ksi) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
+        // to determine the Accept header
+        let httpHeaderAccepts: string[] = [
+            'application/json'
+        ];
+        const httpHeaderAcceptSelected: string | undefined = this.configuration.selectHeaderAccept(httpHeaderAccepts);
+        if (httpHeaderAcceptSelected != undefined) {
+            headers = headers.set('Accept', httpHeaderAcceptSelected);
+        }
+
+        // to determine the Content-Type header
+        const consumes: string[] = [
+            'application/json'
+        ];
+        const httpContentTypeSelected: string | undefined = this.configuration.selectHeaderContentType(consumes);
+        if (httpContentTypeSelected != undefined) {
+            headers = headers.set('Content-Type', httpContentTypeSelected);
+        }
+
+        return this.httpClient.request<string>('post',`${this.basePath}/admin/instanceConfig`,
+            {
+                body: body,
+                withCredentials: this.configuration.withCredentials,
+                headers: headers,
+                observe: observe,
+                reportProgress: reportProgress
+            }
+        );
+    }
+
     /**
      * 
      * 
@@ -4246,21 +4347,21 @@ export class DefaultService {
     /**
      * 
      * 
-     * @param _wave 
+     * @param wave 
      * @param year 
      * @param observe set whether or not to return the data Observable as the body, response or events. defaults to returning the body.
      * @param reportProgress flag to report request and response progress.
      */
-    public threadsGetAll(_wave?: number, year?: number, observe?: 'body', reportProgress?: boolean): Observable<ThreadsResponse>;
-    public threadsGetAll(_wave?: number, year?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ThreadsResponse>>;
-    public threadsGetAll(_wave?: number, year?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ThreadsResponse>>;
-    public threadsGetAll(_wave?: number, year?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
+    public threadsGetAll(wave?: number, year?: number, observe?: 'body', reportProgress?: boolean): Observable<ThreadsResponse>;
+    public threadsGetAll(wave?: number, year?: number, observe?: 'response', reportProgress?: boolean): Observable<HttpResponse<ThreadsResponse>>;
+    public threadsGetAll(wave?: number, year?: number, observe?: 'events', reportProgress?: boolean): Observable<HttpEvent<ThreadsResponse>>;
+    public threadsGetAll(wave?: number, year?: number, observe: any = 'body', reportProgress: boolean = false ): Observable<any> {
 
 
 
         let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
-        if (_wave !== undefined && _wave !== null) {
-            queryParameters = queryParameters.set('_wave', <any>_wave);
+        if (wave !== undefined && wave !== null) {
+            queryParameters = queryParameters.set('wave', <any>wave);
         }
 
         let headers = this.defaultHeaders;
@@ -4739,6 +4840,14 @@ export class DefaultService {
             headers = headers.set('year', String(year));
         }
 
+        // authentication (ksi) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
         // to determine the Accept header
         let httpHeaderAccepts: string[] = [
             'application/json'
@@ -4780,6 +4889,14 @@ export class DefaultService {
 
         let headers = this.defaultHeaders;
 
+        // authentication (ksi) required
+        if (this.configuration.accessToken) {
+            const accessToken = typeof this.configuration.accessToken === 'function'
+                ? this.configuration.accessToken()
+                : this.configuration.accessToken;
+            headers = headers.set('Authorization', 'Bearer ' + accessToken);
+        }
+
         // to determine the Accept header
         let httpHeaderAccepts: string[] = [
             'application/json'

src/api/backend/model/achievement.ts

@@ -14,6 +14,7 @@ export interface Achievement {
     title: string;
     picture: string;
     description: string;
+    persistent: boolean;
     id: number;
     year: number;
 }

src/api/backend/model/achievementBase.ts

@@ -0,0 +1,18 @@
+/**
+ * web-backend-swagger
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ */
+
+export interface AchievementBase { 
+    title: string;
+    picture: string;
+    description: string;
+    persistent: boolean;
+}

src/api/backend/model/achievementCreation.ts

@@ -11,8 +11,4 @@
  */
 
 export interface AchievementCreation { 
-    title: string;
-    picture: string;
-    description: string;
-    persistent: boolean;
 }