Merge branch 'develop' into feature/tauri-beta-update

desktop/angular/docker.sh

@@ -11,8 +11,8 @@ mnt="$( cd ../.. && pwd )"
 docker run                                \
     -ti                                   \
     --rm                                  \
-    -v $mnt:/portmaster-ui                \
-    -w /portmaster-ui/modules/portmaster  \
+    -v $mnt:/portmaster                   \
+    -w /portmaster/desktop/angular        \
     -p 8081:8080                          \
     node:latest                           \
     npm start -- --host 0.0.0.0 --port 8080

desktop/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "portmaster",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "scripts": {
     "ng": "ng",
     "start": "npm install && npm run build-libs:dev && ng serve --proxy-config ./proxy.json",

desktop/angular/projects/safing/portmaster-api/src/lib/debug-api.service.ts

@@ -18,6 +18,12 @@ export class DebugAPI {
     })
   }
 
+  ready(): Observable<string> {
+    return this.http.get(`${this.httpAPI}/v1/ready`, {
+      responseType: 'text'
+    })
+  }
+
   getStack(): Observable<string> {
     return this.http.get(`${this.httpAPI}/v1/debug/stack`, {
       responseType: 'text'

desktop/angular/src/app/pages/app-view/app-view.html

@@ -181,6 +181,8 @@
             Get Help
           </a>
 
+          <!--
+          TODO: "View Active" button is broken or should have been removed.
           <div sfngTipUpAnchor="left" class="flex space-x-2 flex-rows">
             <sfng-tipup key="appSettings-Filter"></sfng-tipup>
             <sfng-select [ngModel]="viewSetting" (ngModelChange)="viewSettingChange.next($event)"
@@ -193,6 +195,7 @@
               </sfng-select-item>
             </sfng-select>
           </div>
+          -->
         </div>
 
         <div class="flex items-center text-tertiary">

desktop/angular/src/app/pages/spn/map-renderer/map-renderer.ts

@@ -195,6 +195,8 @@ export class MapRendererComponent implements OnInit, AfterViewInit, OnDestroy {
     data.forEach((country: any) => {
       this.countryNames[country.properties.iso_a2] = country.properties.name
     })
+    // Add special country values.
+    this.countryNames["__"] = "Anycast"
 
     this.worldGroup.selectAll()
       .data<GeoPermissibleObjects>(data)

desktop/angular/src/app/shared/app-icon/app-icon.ts

@@ -94,7 +94,7 @@ export class AppIconComponent implements OnInit, OnDestroy {
     this._profile = p || null;
 
     if (this.initDone) {
-      this.updateView(true);
+      this.updateView();
     }
   }
   get profile(): IDandName | null | undefined {

desktop/angular/src/app/shared/netquery/connection-details/conn-details.html

@@ -180,14 +180,14 @@
     <span sfngAddToFilter="remote_ip" [sfngAddToFilterValue]="conn.remote_ip">
       <span>Remote Peer:</span>
       <span>
-        <span *ngIf="!!conn.country" [appCountryFlags]="conn.country"></span>
         {{ conn.remote_ip || 'DNS Request'}}
         <span *ngIf="conn.remote_port" class="text-tertiary">{{ ':'+conn.remote_port }}</span>
       </span>
     </span>
     <span sfngAddToFilter="country" [sfngAddToFilterValue]="conn.country">
       <span>Country:</span>
-      <span>{{ conn.country || 'N/A'}}</span>
+      <span *ngIf="!!conn.country" [appCountryFlags]="conn.country"></span>
+      <span>{{ (conn.country | countryName) || 'N/A' }}</span>
     </span>
     <span sfngAddToFilter="asn" [sfngAddToFilterValue]="conn.asn">
       <span>ASN:</span>

desktop/angular/src/app/shared/netquery/pipes/location.pipe.ts

@@ -11,6 +11,9 @@ export class ConnectionLocationPipe implements PipeTransform {
       return '';
     }
     if (!!conn.country) {
+      if (conn.country === "__") {
+        return "Anycast"
+      }
       return conn.country;
     }