Merge branch '8.0.x' into development

thoth-tech · Jun 1, 2024 · 0580a54 · 0580a54
2 parents ea16363 + f538239
commit 0580a54
Show file tree

Hide file tree

Showing 52 changed files with 944 additions and 415 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -18,6 +18,18 @@
         "jasmine": true
       },
       "rules": {
+        "@typescript-eslint/no-unused-vars": [
+          "warn",
+          {
+            "args": "all",
+            "argsIgnorePattern": "^_",
+            "caughtErrors": "all",
+            "caughtErrorsIgnorePattern": "^_",
+            "destructuredArrayIgnorePattern": "^_",
+            "varsIgnorePattern": "^_",
+            "ignoreRestSiblings": true
+          }
+        ],
         "@angular-eslint/no-empty-lifecycle-method": "warn",
         "@angular-eslint/component-class-suffix": "warn",
         "@angular-eslint/no-output-on-prefix": "warn",

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -16,25 +16,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup meta for development image
         id: docker_meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: lmsdoubtfire/doubtfire-web
           tags: |
             type=semver,pattern={{major}}.{{minor}}.x-dev
       - name: Build and push web server
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}
@@ -48,18 +48,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         if: github.event_name != 'pull_request'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup meta for web server
         id: docker_meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: lmsdoubtfire/doubtfire-web
           tags: |
@@ -70,7 +70,7 @@ jobs:
             type=semver,pattern=prod-{{major}}
       - name: Build and push web server
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           file: deploy.Dockerfile
           context: .

diff --git a/.github/workflows/nodejs-ci.yml b/.github/workflows/nodejs-ci.yml
@@ -13,16 +13,16 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [18.x]
+        node-version: [20]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: browser-actions/setup-chrome@latest
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install -g @angular/cli
       - run: npm ci
-      - run: npm run lint
+      # - run: npm run lint
       # - run: npm run test:ci
       - run: npm run build --if-present
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/Dockerfile b/Dockerfile
@@ -22,7 +22,7 @@ WORKDIR /doubtfire-web
 COPY --chown="${USER}":root . .
 
 # Setup within container
-RUN npm install --force
+RUN npm ci --force --include=optional
 
 EXPOSE 9876
 

diff --git a/deploy.Dockerfile b/deploy.Dockerfile
@@ -7,7 +7,7 @@ USER node
 # Copy in doubtfire-web code
 WORKDIR /doubtfire-web
 COPY package.json package-lock.json ./
-RUN npm ci --force
+RUN npm ci --force --include=optional
 
 COPY --chown=node:node . .
 RUN chmod 777 src

diff --git a/nginx.conf b/nginx.conf
@@ -12,8 +12,8 @@ http {
         listen 80;
 
         add_header Content-Security-Policy "default-src https: 'unsafe-inline' 'unsafe-eval' blob: data: ws:" always;
-        add_header Feature-Policy "microphone 'self';speaker 'self';fullscreen 'self';payment none;" always;
-        add_header Permissions-Policy "microphone=(self), fullscreen=(self), payment=()" always;
+        # add_header Feature-Policy "microphone=(self),speaker=(self),fullscreen=(self),payment=(none);" always;
+        add_header Permissions-Policy "microphone=(self),speaker=(self),fullscreen=(self),payment=(none)" always;
     }
 
     gzip on;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "doubtfire",
-  "version": "8.0.0-4",
-  "homepage": "https://github.com/doubtfire-lms/",
+  "version": "8.0.9",
+  "homepage": "http://github.com/doubtfire-lms/",
   "description": "Learning and feedback tool.",
   "license": "AGPL-3.0",
   "repository": {},
@@ -41,6 +41,7 @@
     "@angular/service-worker": "^17.3.6",
     "@angular/upgrade": "^17.3.6",
     "@ctrl/ngx-emoji-mart": "^9.2.0",
+    "@ngneat/hotkeys": "^4.0.0",
     "@uirouter/angular": "^13.0",
     "@uirouter/angular-hybrid": "^17.1.0",
     "@uirouter/angularjs": "^1.0.30",
@@ -73,7 +74,7 @@
     "font-awesome": "~4.7.0",
     "jquery": "2.1.4",
     "lodash": "~4.17",
-    "lottie-web": "^5",
+    "lottie-web": "^5.12.2",
     "marked": "^11.1.0",
     "moment": "^2.29.4",
     "ng-csv": "0.2.3",
@@ -82,7 +83,7 @@
     "ng2-pdf-viewer": "^10.0",
     "ngx-bootstrap": "^6.1.0",
     "ngx-entity-service": "^0.0.38",
-    "ngx-lottie": "^10.0.0",
+    "ngx-lottie": "^11.0.2",
     "nvd3": "1.8.6",
     "rxjs": "~7.4.0",
     "ts-md5": "^1.3.1",
@@ -159,5 +160,11 @@
     "ts-node": "~10.9",
     "typescript": "~5.2",
     "underscore": "^1.8.3"
+  },
+  "optionalDependencies": {
+    "@nx/nx-darwin-arm64": "^18.0",
+    "@nx/nx-darwin-x64": "^18.0",
+    "@nx/nx-linux-x64-gnu": "^18.0",
+    "@nx/nx-win32-x64-msvc": "^18.0"
   }
 }
diff --git a/src/app/admin/states/f-units/f-units.component.html b/src/app/admin/states/f-units/f-units.component.html
@@ -18,6 +18,9 @@ <h3>{{ title }}</h3>
       [dataSource]="dataSource"
       matSort
       (matSortChange)="sortTableData($event)"
+      matSortActive="start_date"
+      matSortDirection="desc"
+      matSortDisableClear
     >
       <!-- Unit Code Column -->
       <ng-container matColumnDef="unit_code" sticky>
@@ -52,11 +55,7 @@ <h3>{{ title }}</h3>
       <ng-container matColumnDef="teaching_period" sticky>
         <th mat-header-cell *matHeaderCellDef mat-sort-header>Teaching Period</th>
         <td mat-cell *matCellDef="let element">
-          @if (element.teachingPeriod) {
-            {{ element.teachingPeriod.name }}
-          } @else {
-            Custom
-          }
+          {{ element.teaching_period }}
         </td>
       </ng-container>
 
@@ -69,7 +68,7 @@ <h3>{{ title }}</h3>
       <!-- End Date Column -->
       <ng-container matColumnDef="end_date" sticky>
         <th mat-header-cell *matHeaderCellDef mat-sort-header>End Date</th>
-        <td mat-cell *matCellDef="let element">{{ element.start_date | date: 'EEE d MMM y' }}</td>
+        <td mat-cell *matCellDef="let element">{{ element.end_date | date: 'EEE d MMM y' }}</td>
       </ng-container>
 
       <!-- Active Column -->