Merge pull request #1037 from adshares/develop

Develop

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.6.1] - 2023-08-07
+### Added
+- Direct deals for publisher
+
 ## [2.6.0] - 2023-07-25
 ### Added
 - Custom logos support in dark mode
@@ -594,7 +598,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Publisher features (Sites & AdUnits)
 
 
-[Unreleased]: https://github.com/adshares/adpanel/compare/v2.6.0...develop
+[Unreleased]: https://github.com/adshares/adpanel/compare/v2.6.1...develop
+[2.6.1]: https://github.com/adshares/adpanel/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/adshares/adpanel/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/adshares/adpanel/compare/v2.4.6...v2.5.0
 [2.4.6]: https://github.com/adshares/adpanel/compare/v2.4.5...v2.4.6

src/app/models/initial-state/site.ts

@@ -20,6 +20,7 @@ export const siteInitialState: Site = {
   medium: 'web',
   vendor: null,
   onlyAcceptedBanners: false,
+  onlyDirectDeals: false,
   filtering: {
     requires: {},
     excludes: {},

src/app/models/site.model.ts

@@ -10,6 +10,7 @@ interface Site {
   medium: string;
   vendor: string | null;
   onlyAcceptedBanners: boolean;
+  onlyDirectDeals: boolean;
   filtering: {
     requires: object;
     excludes: object;

src/app/publisher/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.html

@@ -2,31 +2,25 @@
 <section class="homepage-view site-edit-additional-targeting container">
   <div class="ap-box">
     <h1 class="ap-heading ap-heading--h2 box-title">Classification</h1>
-    <div class="box-content">
-      <mat-checkbox
-        id="require-classified-checkbox"
-        [(ngModel)]="isCheckedOnlyAcceptedBanners"
-        data-test="publisher-edit-site-require-classified-checkbox">
+    <div class="col box-content">
+      <mat-checkbox [(ngModel)]="isCheckedOnlyAcceptedBanners" (change)="onChangeOnlyAcceptedBanners($event)">
         Manual approval of banners
         <fa-icon
           [icon]="faQuestionCircle"
           class="ap-icon ap-icon--append ap-copy--secondary"
-          matTooltip="After set this setting you will be able to approve banners for this particular site."
+          matTooltip="After setting this, you will be able to approve banners for this particular site."
           matTooltipClass="ap-mat-tooltip"
           matTooltipPosition="right"></fa-icon>
       </mat-checkbox>
+      <mat-checkbox [(ngModel)]="isCheckedOnlyDirectDeals" (change)="onChangeOnlyDirectDeals($event)">
+        Only direct deals
+      </mat-checkbox>
     </div>
 
     <div class="box-content">
-      <mat-accordion
-        multi="true"
-        class="targeting-accordion"
-        data-test="publisher-edit-site-additional-targeting-accordion">
+      <mat-accordion multi="true" class="targeting-accordion">
         <div *ngIf="showRequiresSection">
-          <mat-expansion-panel
-            (opened)="requirePanelOpenState = true"
-            (closed)="requirePanelOpenState = false"
-            data-test="publisher-edit-site-additional-targeting-accordion-panel-required">
+          <mat-expansion-panel (opened)="requirePanelOpenState = true" (closed)="requirePanelOpenState = false">
             <mat-expansion-panel-header class="ap-heading ap-heading--h3">
               <mat-panel-title>Targeting</mat-panel-title>
             </mat-expansion-panel-header>
@@ -71,8 +65,7 @@ <h1 class="ap-heading ap-heading--h2 box-title">Classification</h1>
         <mat-expansion-panel
           (opened)="excludePanelOpenState = true"
           (closed)="excludePanelOpenState = false"
-          [expanded]="true"
-          data-test="publisher-edit-site-additional-targeting-accordion-panel-excluded">
+          [expanded]="true">
           <mat-expansion-panel-header class="ap-heading ap-heading--h3">
             <mat-panel-title> Exclusions</mat-panel-title>
           </mat-expansion-panel-header>

src/app/publisher/edit-site/edit-site-additional-targeting/edit-site-additional-targeting.component.ts

@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import { MatCheckboxChange } from '@angular/material/checkbox';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Store } from '@ngrx/store';
 import { first } from 'rxjs/operators';
@@ -7,7 +8,7 @@ import {
   AddSiteToSites,
   ClearLastEditedSite,
   SaveSiteFiltering,
-  SaveSiteOnlyAcceptedBanners,
+  SaveSiteOptions,
   UPDATE_SITE_FAILURE,
   UpdateSite,
 } from 'store/publisher/publisher.actions';
@@ -40,6 +41,7 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
   changesSaved: boolean = false;
   showRequiresSection: boolean = false;
   isCheckedOnlyAcceptedBanners: boolean;
+  isCheckedOnlyDirectDeals: boolean;
   faQuestionCircle = faQuestionCircle;
 
   constructor(
@@ -98,6 +100,7 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
       ...reducedSite,
       filtering: parseTargetingForBackend(filtering),
       onlyAcceptedBanners: this.isCheckedOnlyAcceptedBanners,
+      onlyDirectDeals: this.isCheckedOnlyDirectDeals,
     };
   }
 
@@ -122,6 +125,7 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
       this.site = {
         ...this.site,
         onlyAcceptedBanners: this.isCheckedOnlyAcceptedBanners,
+        onlyDirectDeals: this.isCheckedOnlyDirectDeals,
         status: siteStatusEnum.DRAFT,
         filteringArray: chosenTargeting,
       };
@@ -132,7 +136,12 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
       this.subscriptions.push(errorSubscription);
     } else {
       this.store.dispatch(new SaveSiteFiltering(chosenTargeting));
-      this.store.dispatch(new SaveSiteOnlyAcceptedBanners(this.isCheckedOnlyAcceptedBanners));
+      this.store.dispatch(
+        new SaveSiteOptions({
+          onlyAcceptedBanners: this.isCheckedOnlyAcceptedBanners,
+          onlyDirectDeals: this.isCheckedOnlyDirectDeals,
+        })
+      );
       this.router.navigate(['/publisher', 'create-site', 'summary']);
     }
   }
@@ -159,7 +168,20 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
         } else {
           this.isCheckedOnlyAcceptedBanners = lastEditedSite.onlyAcceptedBanners;
         }
+        this.isCheckedOnlyDirectDeals = lastEditedSite.onlyDirectDeals;
       });
     this.subscriptions.push(lastSiteSubscription);
   }
+
+  onChangeOnlyAcceptedBanners($event: MatCheckboxChange) {
+    if (!$event.checked) {
+      this.isCheckedOnlyDirectDeals = false;
+    }
+  }
+
+  onChangeOnlyDirectDeals($event: MatCheckboxChange) {
+    if ($event.checked) {
+      this.isCheckedOnlyAcceptedBanners = true;
+    }
+  }
 }

src/app/publisher/site-details/site-details.component.html

@@ -2,11 +2,11 @@
   <div class="site-details container">
     <div class="row justify-between">
       <div class="row align-center breadcrumbs">
-        <a routerLink="/publisher/dashboard" data-test="publisher-navigate-to-dashboard">
+        <a routerLink="/publisher/dashboard">
           <p class="ap-copy ap-copy--small">My sites</p>
         </a>
         <div class="ap-circle ap-circle--x-small ap-circle--navy breadcrumbs-divider"></div>
-        <p class="ap-copy ap-copy--small ap-copy--x-dark ap-copy--semi" data-test="publisher-site-url">
+        <p class="ap-copy ap-copy--small ap-copy--x-dark ap-copy--semi">
           {{ site.name }}
         </p>
       </div>
@@ -15,8 +15,7 @@
         *ngIf="site.onlyAcceptedBanners"
         class="ap-btn ap-btn--primary"
         (click)="navigateToClassification()"
-        [disabled]="!isSitePositivelyVerified"
-        data-test="publisher-site-navigate-to-classifier">
+        [disabled]="!isSitePositivelyVerified">
         <fa-icon class="ap-icon ap-icon--prepend" [icon]="faEdit"></fa-icon>
         Select banners for approval
       </button>
@@ -25,8 +24,8 @@
     <div *ngIf="site.needsAdsTxtConfirmation" class="ap-alert ap-alert--warning">
       <h1 class="ap-heading--h4">Add ads.txt entry</h1>
       <p>
-        This site needs specific ads.txt entry to display advertisements. Please add the following entry to your
-        ads.txt file:<br />
+        This site needs specific ads.txt entry to display advertisements. Please add the following entry to your ads.txt
+        file:<br />
         <code>{{ adsTxtEntry }}</code>
       </p>
       <p>
@@ -77,7 +76,7 @@ <h1 class="ap-heading--h4">Add ads.txt entry</h1>
 
       <div class="row justify-between align-start box-title">
         <div class="col">
-          <h2 class="ap-heading ap-heading--h2" data-test="publisher-site-url">
+          <h2 class="ap-heading ap-heading--h2">
             {{ site.name }}
             <span class="ap-copy" *ngIf="!isMetaverse">
               {{ site.domain }}
@@ -93,8 +92,7 @@ <h2 class="ap-heading ap-heading--h2" data-test="publisher-site-url">
         <button
           class="ap-btn ap-btn--text"
           (click)="navigateToEditSite('basic-information')"
-          [disabled]="siteStatusEnum.PENDING === this.site.status"
-          data-test="publisher-site-edit-basic-info-button">
+          [disabled]="siteStatusEnum.PENDING === this.site.status">
           <fa-icon [icon]="faEdit" class="ap-icon ap-icon--prepend"></fa-icon>
           Edit basic info
         </button>
@@ -129,12 +127,7 @@ <h1 class="ap-heading ap-heading--h2 box-title">Statistics</h1>
             [barChartLabels]="barChartLabels"></app-chart>
         </div>
         <div class="row justify-end">
-          <button
-            (click)="downloadReport()"
-            class="ap-btn ap-btn--secondary ap-copy--dark"
-            data-test="publisher-site-download-report-button">
-            Generate a report
-          </button>
+          <button (click)="downloadReport()" class="ap-btn ap-btn--secondary ap-copy--dark">Generate a report</button>
         </div>
       </div>
     </div>
@@ -146,8 +139,7 @@ <h1 class="ap-heading ap-heading--h2">Exclusions & Targeting</h1>
         <button
           class="ap-btn ap-btn--text"
           (click)="navigateToEditSite('additional-filtering')"
-          [disabled]="!isSitePositivelyVerified"
-          data-test="publisher-site-edit-filtering-button">
+          [disabled]="!isSitePositivelyVerified">
           <fa-icon [icon]="faEdit" class="ap-icon ap-icon--prepend"></fa-icon>
           {{
             !filtering.requires.length && !filtering.excludes.length && !site.onlyAcceptedBanners
@@ -157,18 +149,24 @@ <h1 class="ap-heading ap-heading--h2">Exclusions & Targeting</h1>
         </button>
       </div>
       <div *ngIf="!!filtering.requires.length || !!filtering.excludes.length || site.onlyAcceptedBanners">
-        <div *ngIf="site.onlyAcceptedBanners" class="ap-copy row align-center box-content">
-          <mat-checkbox class="site-details__checkbox" checked="checked" disabled>
-            Manual approval of banners
-          </mat-checkbox>
-          <button
-            class="ap-btn ap-btn--text"
-            (click)="navigateToClassification()"
-            [disabled]="!isSitePositivelyVerified"
-            data-test="publisher-site-edit-filtering-button">
-            <fa-icon [icon]="faEdit" class="ap-icon ap-icon--prepend"></fa-icon>
-            Select banners for approval
-          </button>
+        <div class="ap-copy row align-center box-content">
+          <div class="col">
+            <mat-checkbox class="site-details__checkbox" checked="checked" disabled>
+              Manual approval of banners
+            </mat-checkbox>
+            <mat-checkbox *ngIf="site.onlyDirectDeals" class="site-details__checkbox" checked="checked" disabled>
+              Only direct deals
+            </mat-checkbox>
+          </div>
+          <div class="col">
+            <button
+              class="ap-btn ap-btn--text"
+              (click)="navigateToClassification()"
+              [disabled]="!isSitePositivelyVerified">
+              <fa-icon [icon]="faEdit" class="ap-icon ap-icon--prepend"></fa-icon>
+              Select banners for approval
+            </button>
+          </div>
         </div>
       </div>
 
@@ -201,8 +199,7 @@ <h2 class="ap-heading ap-heading--h2">List of enabled pops</h2>
         <button
           class="ap-btn ap-btn--text"
           (click)="navigateToEditSite('pops-settings')"
-          [disabled]="!isSitePositivelyVerified"
-          data-test="publisher-site-edit-pops-button">
+          [disabled]="!isSitePositivelyVerified">
           <fa-icon [icon]="faEdit" class="ap-icon ap-icon--prepend"></fa-icon>
           Edit pops
         </button>
@@ -222,11 +219,7 @@ <h2 class="ap-heading ap-heading--h2">List of enabled pops</h2>
         </table>
       </div>
       <div *ngIf="!!popAdUnits.length" class="box-content row justify-center">
-        <button
-          class="ap-btn ap-btn--secondary"
-          [disabled]="!isSitePositivelyVerified"
-          (click)="openGetCodeDialog()"
-          data-test="publisher-get-code-button">
+        <button class="ap-btn ap-btn--secondary" [disabled]="!isSitePositivelyVerified" (click)="openGetCodeDialog()">
           Get placement codes
         </button>
       </div>
@@ -239,8 +232,7 @@ <h2 class="ap-heading ap-heading--h2">List of placements</h2>
           *ngIf="editAds"
           class="ap-btn ap-btn--text ap-btn--edit ap-btn--no-border"
           (click)="navigateToEditSite('create-ad-units')"
-          [disabled]="!isSitePositivelyVerified"
-          data-test="publisher-site-edit-ad-units-button">
+          [disabled]="!isSitePositivelyVerified">
           <fa-icon [icon]="faEdit" class="ap-icon ap-icon--prepend"></fa-icon>
           Edit placements
         </button>
@@ -260,19 +252,15 @@ <h2 class="ap-heading ap-heading--h2">List of placements</h2>
         </table>
       </div>
       <div *ngIf="!!displayAdUnits.length" class="box-content row justify-center">
-        <button
-          class="ap-btn ap-btn--secondary"
-          [disabled]="!isSitePositivelyVerified"
-          (click)="openGetCodeDialog()"
-          data-test="publisher-get-code-button">
+        <button class="ap-btn ap-btn--secondary" [disabled]="!isSitePositivelyVerified" (click)="openGetCodeDialog()">
           Get placement codes
         </button>
       </div>
     </div>
 
     <div class="ap-box">
       <div class="box-content row justify-center">
-        <button routerLink="/publisher/dashboard" class="ap-btn ap-btn--primary" data-test="publisher-get-code-button">
+        <button routerLink="/publisher/dashboard" class="ap-btn ap-btn--primary">
           <fa-icon [icon]="faArrowLeft" class="ap-icon ap-icon--prepend"></fa-icon>
           Dashboard
         </button>

src/app/store/publisher/publisher.actions.ts

@@ -27,7 +27,7 @@ export const CLEAR_LAST_EDITED_SITE = 'Last edited site cleared';
 export const SET_LAST_EDITED_SITE = 'Last edited site set';
 export const SAVE_LAST_EDITED_SITE = 'Basic site informations saved';
 export const SAVE_LAST_EDITED_SITE_FILTERING = 'Site filtering saved';
-export const SAVE_LAST_EDITED_SITE_ONLY_ACCEPTED_BANNERS = 'Site only accepted banners saved';
+export const SAVE_LAST_EDITED_OPTIONS = 'Site options saved';
 export const SAVE_LAST_EDITED_SITE_AD_UNITS = 'Site placements saved';
 
 export const ADD_SITE_TO_SITES = 'Save site';
@@ -145,10 +145,10 @@ export class SaveSiteFiltering implements Action {
   constructor(public payload: AssetTargeting) {}
 }
 
-export class SaveSiteOnlyAcceptedBanners implements Action {
-  readonly type: string = SAVE_LAST_EDITED_SITE_ONLY_ACCEPTED_BANNERS;
+export class SaveSiteOptions implements Action {
+  readonly type: string = SAVE_LAST_EDITED_OPTIONS;
 
-  constructor(public payload: boolean) {}
+  constructor(public payload: object) {}
 }
 
 export class SaveLastEditedSiteAdUnits implements Action {

src/app/store/publisher/publisher.reducers.ts

@@ -142,12 +142,12 @@ export function publisherReducers(state = initialState, action: PublisherActions
           filteringArray: action.payload,
         },
       };
-    case PublisherActions.SAVE_LAST_EDITED_SITE_ONLY_ACCEPTED_BANNERS:
+    case PublisherActions.SAVE_LAST_EDITED_OPTIONS:
       return {
         ...state,
         lastEditedSite: {
           ...state.lastEditedSite,
-          onlyAcceptedBanners: action.payload,
+          ...action.payload,
         },
       };
     case PublisherActions.SAVE_LAST_EDITED_SITE_AD_UNITS: