Merge pull request #830 from Kyusung4698/develop

1.0.11 (2020-09-20)
Kyusung4698 · Sep 19, 2020 · 51e16d3 · 51e16d3
2 parents b78adf5 + 29eacc2
commit 51e16d3
Show file tree

Hide file tree

Showing 57 changed files with 284,285 additions and 23,154 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## 1.0.11 (2020-09-20)
+
+- added heist item data & stats
+- added heist item properties at the evaluate dialog
+- added heist item types at the market
+- added heist filter group at the market
+- updated the external link behavior to skip in game notification
+- fixed an issue causing values at the evaluate dialog to be cut off (#827, #829)
+- fixed an issue freezing the launcher (#826)
+- fixed an issue with too long stats at the market window (#814)
+- fixed an issue using the slider at the settings window (#815)
+
 ## 1.0.10 (2020-08-02)
 
 - added whois button to the trade window

diff --git a/manifest.json b/manifest.json
@@ -4,8 +4,8 @@
     "meta": {
         "name": "PoE Overlay",
         "author": "Kyusung4698",
-        "version": "1.0.10",
-        "minimum-overwolf-version": "0.147.0",
+        "version": "1.0.11",
+        "minimum-overwolf-version": "0.153.0",
         "description": "Search the market and send trade offers. Get current market values for your item. View insights for maps and items.",
         "dock_button_title": "PoE Overlay",
         "icon": "assets/logo.png",

diff --git a/overlay.babel b/overlay.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -130,7 +130,7 @@
                         </children>
                     </folder_node>
                     <folder_node>
-                        <name>changelog-1-0-10</name>
+                        <name>changelog-1-0-11</name>
                         <children>
                             <concept_node>
                                 <name>message</name>
@@ -12010,6 +12010,59 @@
                             </translation>
                         </translations>
                     </concept_node>
+                    <concept_node>
+                        <name>help</name>
+                        <definition_loaded>false</definition_loaded>
+                        <description></description>
+                        <comment></comment>
+                        <default_text></default_text>
+                        <translations>
+                            <translation>
+                                <language>de-DE</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>en-US</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>es-ES</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>fr-FR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ko-KR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pl-PL</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>pt-BR</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>ru-RU</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>th-TH</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHS</language>
+                                <approved>false</approved>
+                            </translation>
+                            <translation>
+                                <language>zh-CHT</language>
+                                <approved>false</approved>
+                            </translation>
+                        </translations>
+                    </concept_node>
                     <concept_node>
                         <name>kill</name>
                         <definition_loaded>false</definition_loaded>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "poe-overlay-overwolf",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "scripts": {
     "watch": "ng build --watch",
     "watch:prod": "ng build --watch --prod",

diff --git a/src/app/app.component.html b/src/app/app.component.html
@@ -1,5 +1,5 @@
-<ng-container *ngIf="window$ | async as window">
-    <ng-container [ngSwitch]="window.name">
+<ng-container *ngIf="window$ | async as name">
+    <ng-container [ngSwitch]="name">
         <app-background-window *ngSwitchCase="'background'"></app-background-window>
         <app-evaluate-window *ngSwitchCase="'evaluate'"></app-evaluate-window>
         <app-inspect-window *ngSwitchCase="'inspect'"></app-inspect-window>
@@ -11,6 +11,6 @@
         <app-annotation-window *ngSwitchCase="'annotation'"></app-annotation-window>
         <app-trade-window *ngSwitchCase="'trade'"></app-trade-window>
         <app-trade-highlight-window *ngSwitchCase="'tradehighlight'"></app-trade-highlight-window>
-        <div *ngSwitchDefault>Could not match window with name: {{window.name}}</div>
+        <div *ngSwitchDefault>Could not match window with name: {{name}}</div>
     </ng-container>
 </ng-container>
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -35,16 +35,6 @@ export class AppComponent implements OnInit, OnDestroy {
                 const { language, leagueId } = settings;
                 return this.context.init({ language, leagueId });
             }),
-            tap(() => {
-                this.subscription = this.settings.change().on(settings => {
-                    this.ngZone.run(() => {
-                        this.i18n.use(settings.uiLanguage);
-                        const { language, leagueId } = settings;
-                        this.context.update({ language, leagueId });
-                    });
-                });
-            }),
-            mergeMap(() => OWWindows.getCurrentWindow()),
             retryWhen(errors => errors.pipe(
                 mergeMap(error => {
                     console.warn(`An unexpected error occured while loading PoE Overlay. ${error?.message ?? JSON.stringify(error)}`);
@@ -62,7 +52,23 @@ export class AppComponent implements OnInit, OnDestroy {
                     );
                 })
             )),
-            tap(win => this.title.setTitle(`PoE Overlay - ${win.name.charAt(0).toUpperCase()}${win.name.slice(1)}`)),
+            tap(() => {
+                this.subscription = this.settings.change().on(settings => {
+                    this.ngZone.run(() => {
+                        this.i18n.use(settings.uiLanguage);
+                        const { language, leagueId } = settings;
+                        this.context.update({ language, leagueId });
+                    });
+                });
+            }),
+            mergeMap(() => OWWindows.getCurrentWindow().pipe(
+                map(win => win.name),
+                catchError(error => {
+                    console.warn(`An unexpected error occured while getting current window. ${error?.message ?? JSON.stringify(error)}`);
+                    return of('background');
+                })
+            )),
+            tap(win => this.title.setTitle(`PoE Overlay - ${win.charAt(0).toUpperCase()}${win.slice(1)}`)),
             catchError(() => new OWWindow().close().pipe(
                 map(() => null)
             ))

diff --git a/src/app/core/annotation/annotation.service.ts b/src/app/core/annotation/annotation.service.ts
@@ -95,7 +95,7 @@ const ANNOTATIONS: Annotation[] = [
         hotkey: Hotkey.SettingsToggle
     },
     { id: 'thanks' },
-    { id: 'changelog-1-0-10' },
+    { id: 'changelog-1-0-11' },
 ];
 
 @Injectable({

diff --git a/src/app/core/odk/ow-game-listener.ts b/src/app/core/odk/ow-game-listener.ts
@@ -25,7 +25,7 @@ export class OWGameListener {
 
         if (update.resolutionChanged) {
             if (this.delegate.onGameResolutionChanged) {
-                this.delegate.onGameResolutionChanged(update.gameInfo);
+                this.delegate.onGameResolutionChanged({...update.gameInfo});
             }
         }
 
@@ -35,11 +35,11 @@ export class OWGameListener {
 
         if (update.gameInfo.isRunning) {
             if (this.delegate.onGameStarted) {
-                this.delegate.onGameStarted(update.gameInfo);
+                this.delegate.onGameStarted({...update.gameInfo});
             }
         } else {
             if (this.delegate.onGameEnded) {
-                this.delegate.onGameEnded(update.gameInfo);
+                this.delegate.onGameEnded({...update.gameInfo});
             }
         }
     }
@@ -51,7 +51,7 @@ export class OWGameListener {
 
         if (info.isRunning) {
             if (this.delegate.onGameStarted) {
-                this.delegate.onGameStarted(info);
+                this.delegate.onGameStarted({...info});
             }
         }
     }

diff --git a/src/app/core/odk/ow-replay.ts b/src/app/core/odk/ow-replay.ts
@@ -1,6 +1,19 @@
 import { from, Observable } from 'rxjs';
 
 export class OWReplay {
+    public static path(): Observable<string> {
+        const promise = new Promise<string>((resolve, reject) => {
+            overwolf.settings.getOverwolfVideosFolder(result => {
+                if (result.success && result.path?.Value) {
+                    resolve(result.path.Value);
+                } else {
+                    reject(result.error);
+                }
+            });
+        });
+        return from(promise);
+    }
+
     public static turnOn(settings: any): Observable<void> {
         const promise = new Promise<void>((resolve, reject) => {
             overwolf.media.replays.turnOn(settings, result => {

diff --git a/src/app/core/odk/ow-utils.ts b/src/app/core/odk/ow-utils.ts
@@ -26,7 +26,10 @@ export class OWUtils {
     }
 
     public static openUrlInDefaultBrowser(url: string): void {
-        overwolf.utils.openUrlInDefaultBrowser(url);
+        // TODO: Update types
+        (overwolf.utils.openUrlInDefaultBrowser as any)(url, {
+            skip_in_game_notification: true
+        });
     }
 
     public static getSystemInformation(): Observable<SystemInfo> {

diff --git a/src/app/core/odk/ow-windows.ts b/src/app/core/odk/ow-windows.ts
@@ -14,7 +14,7 @@ export class OWWindows {
                 if (result?.success) {
                     resolve(result.window);
                 } else {
-                    reject(result.error);
+                    reject(`Could not get current window. reason: ${result.error ?? JSON.stringify(result)}.`);
                 }
             });
         });

diff --git a/src/app/data/poe/schema/trade-search.ts b/src/app/data/poe/schema/trade-search.ts
@@ -64,6 +64,25 @@ export interface TradeSearchHttpMapFilters {
     map_series?: FilterOption;
 }
 
+export interface TradeSearchHttpHeistFilters {
+    heist_wings?: FilterValueOption;
+    heist_max_wings?: FilterValueOption;
+    heist_escape_routes?: FilterValueOption;
+    heist_max_escape_routes?: FilterValueOption;
+    heist_reward_rooms?: FilterValueOption;
+    heist_max_reward_rooms?: FilterValueOption;
+    area_level?: FilterValueOption;
+    heist_lockpicking?: FilterValueOption;
+    heist_brute_force?: FilterValueOption;
+    heist_perception?: FilterValueOption;
+    heist_demolition?: FilterValueOption;
+    heist_counter_thaumaturgy?: FilterValueOption;
+    heist_trap_disarmament?: FilterValueOption;
+    heist_agility?: FilterValueOption;
+    heist_deception?: FilterValueOption;
+    heist_engineering?: FilterValueOption;
+}
+
 export interface TradeSearchHttpMiscFilters {
     quality?: FilterValueOption;
     ilvl?: FilterValueOption;
@@ -104,6 +123,7 @@ export interface TradeSearchHttpFilters {
     socket_filters?: FilterGroup<TradeSearchHttpSocketFilters>;
     req_filters?: FilterGroup<TradeSearchHttpReqFilters>;
     map_filters?: FilterGroup<TradeSearchHttpMapFilters>;
+    heist_filters?: FilterGroup<TradeSearchHttpHeistFilters>;
     misc_filters?: FilterGroup<TradeSearchHttpMiscFilters>;
     trade_filters?: TradeSearchHttpFilterGroup;
 }

diff --git a/src/app/layout/window/background-window/background-window.component.ts b/src/app/layout/window/background-window/background-window.component.ts
@@ -117,9 +117,10 @@ export class BackgroundWindowComponent implements OnInit, OnDestroy {
         this.shouldQuit = false;
         this.launcherWindow.close();
 
+        const { width, height } = info;
         forkJoin([
-            this.annotationWindow.open(info.width, info.height),
-            this.notificationWindow.open(info.width, info.height)
+            this.annotationWindow.open(width, height),
+            this.notificationWindow.open(width, height)
         ]).pipe(
             mergeMap(() => this.events.start(false)),
         ).subscribe(result => {
@@ -196,7 +197,8 @@ export class BackgroundWindowComponent implements OnInit, OnDestroy {
         if (info?.classId !== OWGameClassId.PathOfExile) {
             return;
         }
-        this.notificationWindow.resize(info.width, info.height).subscribe();
+        const { width, height } = info;
+        this.notificationWindow.resize(width, height).subscribe();
     }
 
     private onStateChange(event: WindowStateChangedEvent): void {

diff --git a/src/app/layout/window/settings-window/settings-window.component.html b/src/app/layout/window/settings-window/settings-window.component.html
@@ -1,5 +1,5 @@
 <ng-container *ngIf="settings$ | async as settings">
-    <app-header name="PoE Overlay - Settings" [fixed]="true" [footer]="true" (supportToggle)="onSupportToggle()">
+    <app-header name="PoE Overlay - Settings" [fixed]="true" [footer]="true" [contentDraggable]="false" (supportToggle)="onSupportToggle()">
         <mat-tab-group mat-stretch-tabs animationDuration="0ms" [selectedIndex]="selectedIndex$ | async"
             (selectedIndexChange)="onSelectedIndexChange($event)">
             <mat-tab [label]="'settings.general' | translate">

diff --git a/src/app/modules/market/component/index.ts b/src/app/modules/market/component/index.ts
@@ -12,17 +12,19 @@ export * from './market-input-select-option/market-input-select-option.component
 export * from './market-input-select/market-input-select.component';
 export * from './market-input/market-input.component';
 export * from './market-item-search-bar/market-item-search-bar.component';
+export * from './market-item-search-filter-heist/market-item-search-filter-heist.component';
 export * from './market-item-search-filter-misc/market-item-search-filter-misc.component';
+export * from './market-item-search-filter-trade/market-item-search-filter-trade.component';
 export * from './market-item-search-filter-type/market-item-search-filter-type.component';
 export * from './market-item-search-filter/market-item-search-filter.component';
+export * from './market-item-search-result/market-item-search-result.component';
 export * from './market-item-search-stat-group/market-item-search-stat-group.component';
 export * from './market-item-search-stat/market-item-search-stat.component';
 export * from './market-item-search-stats/market-item-search-stats.component';
 export * from './market-item-search/market-item-search.component';
 export * from './market-listing-status/market-listing-status.component';
 export * from './market-panel-group/market-panel-group.component';
 export * from './market-panel/market-panel.component';
-export * from './market-item-search-filter-trade/market-item-search-filter-trade.component';
 export * from './market-settings/market-settings.component';
 export * from './market-tab-group/market-tab-group.component';
 export * from './market-tab/market-tab.component';