Merge pull request #1042 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.2] - 2023-12-06
+### Changed
+- Selecting site's placement step depends on taxonomy
+
 ## [2.6.1] - 2023-08-07
 ### Added
 - Direct deals for publisher
@@ -598,7 +602,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.1...develop
+[Unreleased]: https://github.com/adshares/adpanel/compare/v2.6.2...develop
+[2.6.2]: https://github.com/adshares/adpanel/compare/v2.6.1...v2.6.2
 [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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "adpanel",
-  "version": "2.5.0",
+  "version": "2.6.2",
   "scripts": {
     "ng": "ng",
     "start": "ng serve adshares",

src/app/advertiser/campaign-details/campaign-details.component.html

@@ -252,7 +252,7 @@ <h3 class="ap-heading ap-heading--h3">Exclusions:</h3>
       </ng-container>
     </div>
 
-    <!--Campaign list section-->
+    <!--Ads section-->
 
     <div class="col ap-box">
       <div class="row justify-between box-title">

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

@@ -1,4 +1,7 @@
-<app-edit-site-navigation [currentStep]="4" [medium]="site.medium"></app-edit-site-navigation>
+<app-edit-site-navigation
+  [currentStep]="4"
+  [medium]="site.medium"
+  [showPlacements]="showPlacements"></app-edit-site-navigation>
 <section class="homepage-view site-edit-additional-targeting container">
   <div class="ap-box">
     <h1 class="ap-heading ap-heading--h2 box-title">Classification</h1>

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

@@ -15,14 +15,14 @@ import {
 import { AppState } from 'models/app-state.model';
 import { TargetingOption, TargetingOptionValue } from 'models/targeting-option.model';
 import { cloneDeep } from 'common/utilities/helpers';
-import { PublisherService } from 'publisher/publisher.service';
 import { AssetHelpersService } from 'common/asset-helpers.service';
 import { Site } from 'models/site.model';
 import { parseTargetingForBackend } from 'common/components/targeting/targeting.helpers';
 import { HandleSubscriptionComponent } from 'common/handle-subscription.component';
 import { siteStatusEnum } from 'models/enum/site.enum';
 import { faQuestionCircle } from '@fortawesome/free-solid-svg-icons';
 import { Actions, ofType } from '@ngrx/effects';
+import { adUnitTypesEnum } from 'models/enum/ad.enum'
 
 @Component({
   selector: 'app-edit-site-additional-targeting',
@@ -43,12 +43,12 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
   isCheckedOnlyAcceptedBanners: boolean;
   isCheckedOnlyDirectDeals: boolean;
   faQuestionCircle = faQuestionCircle;
+  showPlacements: boolean;
 
   constructor(
     private route: ActivatedRoute,
     private store: Store<AppState>,
     private router: Router,
-    private publisherService: PublisherService,
     private assetHelpers: AssetHelpersService,
     private actions$: Actions
   ) {
@@ -57,6 +57,9 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
 
   ngOnInit(): void {
     this.createSiteMode = !!this.router.url.match('/create-site/');
+    this.showPlacements = this.route.parent.snapshot.data.adUnitSizes.some(
+      adUnit => adUnit.type === adUnitTypesEnum.DISPLAY
+    );
     this.targetingOptionsToAdd = cloneDeep(this.route.parent.snapshot.data.filteringOptions);
     this.targetingOptionsToExclude = cloneDeep(this.route.parent.snapshot.data.filteringOptions);
     this.getSiteFromStore();
@@ -85,7 +88,10 @@ export class EditSiteAdditionalTargetingComponent extends HandleSubscriptionComp
   }
 
   private getPreviousPath(): string {
-    return this.site.medium !== 'metaverse' ? 'create-ad-units' : 'basic-information';
+    if ('metaverse' === this.site.medium) {
+      return 'basic-information';
+    }
+    return this.showPlacements ? 'create-ad-units' : 'pops-settings';
   }
 
   get siteToSave(): Site {

src/app/publisher/edit-site/edit-site-basic-info/edit-site-basic-information.component.html

@@ -1,4 +1,7 @@
-<app-edit-site-navigation [currentStep]="1" [medium]="medium"></app-edit-site-navigation>
+<app-edit-site-navigation
+  [currentStep]="1"
+  [medium]="medium"
+  [showPlacements]="showPlacements"></app-edit-site-navigation>
 <section class="homepage-view site-edit-basic-information container">
   <form [formGroup]="siteBasicInfoForm" class="ap-form" data-test="publisher-edit-site-basic-information-form">
     <div class="ap-box site-edit-basic-information__info-box">

src/app/publisher/edit-site/edit-site-basic-info/edit-site-basic-information.component.ts

@@ -21,7 +21,7 @@ import { User } from 'models/user.model';
 import { PublisherService } from 'publisher/publisher.service';
 import { ErrorResponseDialogComponent } from 'common/dialog/error-response-dialog/error-response-dialog.component';
 import { HandleSubscriptionComponent } from 'common/handle-subscription.component';
-import { SessionService } from '../../../session.service';
+import { adUnitTypesEnum } from 'models/enum/ad.enum'
 
 @Component({
   selector: 'app-edit-site-basic-information',
@@ -58,13 +58,13 @@ export class EditSiteBasicInformationComponent extends HandleSubscriptionCompone
   medium: string;
   vendor: string;
   isConnectedWallet: boolean = false;
+  showPlacements: boolean;
 
   constructor(
     private action$: Actions,
     private router: Router,
     private route: ActivatedRoute,
     private publisherService: PublisherService,
-    private session: SessionService,
     private store: Store<AppState>,
     private dialog: MatDialog
   ) {
@@ -79,6 +79,9 @@ export class EditSiteBasicInformationComponent extends HandleSubscriptionCompone
     });
     this.subscriptions.push(updateSiteFailureSubscription);
     this.createSiteMode = !!this.router.url.match('/create-site/');
+    this.showPlacements = this.route.parent.snapshot.data.adUnitSizes.some(
+      adUnit => adUnit.type === adUnitTypesEnum.DISPLAY
+    );
     if (this.createSiteMode && this.media.length > 0) {
       this.onMediumChange(this.media[0].key);
     }

src/app/publisher/edit-site/edit-site-create-ad-units/edit-site-create-ad-units.component.html

@@ -1,4 +1,7 @@
-<app-edit-site-navigation [currentStep]="3" [medium]="site.medium"></app-edit-site-navigation>
+<app-edit-site-navigation
+  [currentStep]="3"
+  [medium]="site.medium"
+  [showPlacements]="showPlacements"></app-edit-site-navigation>
 <section class="homepage-view site-edit-create-posters-units container">
   <div class="ap-box">
     <div class="box-title">

src/app/publisher/edit-site/edit-site-create-ad-units/edit-site-create-ad-units.component.ts

@@ -3,7 +3,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { Store } from '@ngrx/store';
 
-import { PublisherService } from 'publisher/publisher.service';
 import { AssetHelpersService } from 'common/asset-helpers.service';
 import { cloneDeep } from 'common/utilities/helpers';
 import { AdUnit, AdUnitMetaData, Site } from 'models/site.model';
@@ -44,9 +43,9 @@ export class EditSiteCreateAdUnitsComponent extends HandleSubscriptionComponent
   faCheck = faCheck;
   faTimes = faTimes;
   faTrash = faTrash;
+  showPlacements: boolean;
 
   constructor(
-    private publisherService: PublisherService,
     private assetHelpers: AssetHelpersService,
     private router: Router,
     private route: ActivatedRoute,
@@ -58,7 +57,10 @@ export class EditSiteCreateAdUnitsComponent extends HandleSubscriptionComponent
 
   ngOnInit(): void {
     this.createSiteMode = !!this.router.url.match('/create-site/');
-    this.adUnitSizes = cloneDeep(this.route.snapshot.data.adUnitSizes).filter(
+    this.showPlacements = this.route.parent.snapshot.data.adUnitSizes.some(
+      adUnit => adUnit.type === adUnitTypesEnum.DISPLAY
+    );
+    this.adUnitSizes = cloneDeep(this.route.parent.snapshot.data.adUnitSizes).filter(
       item => item.type === adUnitTypesEnum.DISPLAY
     );
 

src/app/publisher/edit-site/edit-site-navigation/edit-site-navigation.component.ts

@@ -10,13 +10,14 @@ export class EditSiteNavigationComponent implements OnChanges {
 
   @Input() currentStep: number;
   @Input() medium: string;
+  @Input() showPlacements: boolean = false;
 
   ngOnChanges(_changes: SimpleChanges): void {
     if (this.medium !== 'metaverse') {
       this.steps = [
         { id: 1, name: 'Basic information' },
         { id: 2, name: 'Pops' },
-        { id: 3, name: 'Placements' },
+        ...(this.showPlacements ? [{ id: 3, name: 'Placements' }] : []),
         { id: 4, name: 'Exclusions' },
         { id: 5, name: 'Summary' },
       ];

src/app/publisher/edit-site/edit-site-pops-settings/edit-site-pops-settings.component.html

@@ -1,4 +1,7 @@
-<app-edit-site-navigation [currentStep]="2" [medium]="site.medium"></app-edit-site-navigation>
+<app-edit-site-navigation
+  [currentStep]="2"
+  [medium]="site.medium"
+  [showPlacements]="showPlacements"></app-edit-site-navigation>
 <section class="homepage-view site-edit-pops-settings site-edit-create-posters-units container">
   <form [formGroup]="popsSettingsForm" class="ap-form" data-test="publisher-edit-site-pops-settings-form">
     <div class="ap-box site-edit-pops-settings__info-box">
@@ -42,6 +45,9 @@ <h1 class="ap-heading ap-heading--h2">Pops settings</h1>
         </div>
         <div *ngIf="0 === adUnitSizes.length" class="ap-copy">Pops are not available for current medium</div>
       </div>
+      <span *ngIf="this.popsSettingsForm.errors?.noAdUnitSelected" class="error-msg">
+        At least one must be selected
+      </span>
     </div>
 
     <div class="ap-box ap-box--large row justify-between">
@@ -52,10 +58,14 @@ <h1 class="ap-heading ap-heading--h2">Pops settings</h1>
           (click)="saveAdUnits(true)"
           type="button"
           class="ap-btn ap-btn--secondary"
-          [disabled]="changesSaved">
+          [disabled]="!this.popsSettingsForm.valid || changesSaved">
           Save as draft
         </button>
-        <button type="submit" class="ap-btn ap-btn--primary" [disabled]="changesSaved" (click)="onSubmit()">
+        <button
+          type="submit"
+          class="ap-btn ap-btn--primary"
+          [disabled]="!this.popsSettingsForm.valid || changesSaved"
+          (click)="onSubmit()">
           {{ createSiteMode ? 'Save & continue' : 'Update' }}
         </button>
       </div>

src/app/publisher/edit-site/edit-site-pops-settings/edit-site-pops-settings.component.ts

@@ -3,7 +3,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Store } from '@ngrx/store';
 
-import { PublisherService } from 'publisher/publisher.service';
 import { cloneDeep } from 'common/utilities/helpers';
 import { AdUnit, AdUnitMetaData, Site } from 'models/site.model';
 import { AppState } from 'models/app-state.model';
@@ -17,7 +16,6 @@ import {
   UpdateSiteUnits,
 } from 'store/publisher/publisher.actions';
 import { faCheck, faTimes } from '@fortawesome/free-solid-svg-icons';
-import { AssetHelpersService } from 'common/asset-helpers.service';
 import { adUnitStatusesEnum, adUnitTypesEnum } from 'models/enum/ad.enum';
 import { siteStatusEnum } from 'models/enum/site.enum';
 import { Actions, ofType } from '@ngrx/effects';
@@ -35,10 +33,9 @@ export class EditSitePopsSettingsComponent extends HandleSubscriptionComponent i
   createSiteMode: boolean;
   changesSaved: boolean = false;
   site: Site;
+  showPlacements: boolean;
 
   constructor(
-    private publisherService: PublisherService,
-    private assetHelpers: AssetHelpersService,
     private router: Router,
     private route: ActivatedRoute,
     private store: Store<AppState>,
@@ -49,8 +46,11 @@ export class EditSitePopsSettingsComponent extends HandleSubscriptionComponent i
 
   ngOnInit(): void {
     this.createSiteMode = !!this.router.url.match('/create-site/');
-    this.adUnitSizes = cloneDeep(this.route.snapshot.data.adUnitSizes).filter(
-      item => item.type === adUnitTypesEnum.POP
+    this.showPlacements = this.route.parent.snapshot.data.adUnitSizes.some(
+      adUnit => adUnit.type === adUnitTypesEnum.DISPLAY
+    );
+    this.adUnitSizes = cloneDeep(this.route.parent.snapshot.data.adUnitSizes).filter(
+      item => item.type === adUnitTypesEnum.POP && item.size.startsWith('pop-')
     );
 
     this.createForm();
@@ -76,7 +76,15 @@ export class EditSitePopsSettingsComponent extends HandleSubscriptionComponent i
       });
     });
 
-    this.popsSettingsForm = new FormGroup(controls);
+    this.popsSettingsForm = new FormGroup(controls, [
+      (formGroup: FormGroup) => {
+        if (this.showPlacements) {
+          return null;
+        }
+        const anySelected = Object.values(formGroup.value).some((value: any) => value.selected);
+        return anySelected ? null : { noAdUnitSelected: true };
+      },
+    ]);
   }
 
   selectAdUnit(size: string): void {
@@ -112,7 +120,11 @@ export class EditSitePopsSettingsComponent extends HandleSubscriptionComponent i
       });
       this.subscriptions.push(errorSubscription);
     } else {
-      this.router.navigate(['/publisher', 'create-site', 'create-ad-units']);
+      this.router.navigate([
+        '/publisher',
+        'create-site',
+        this.showPlacements ? 'create-ad-units' : 'additional-filtering',
+      ]);
     }
   }
 
@@ -129,6 +141,9 @@ export class EditSitePopsSettingsComponent extends HandleSubscriptionComponent i
     this.subscriptions.push(errorSubscription);
   }
 
+  get isFormValid(): boolean {
+    return !this.showPlacements && this.popsSettingsForm.valid;
+  }
   get adUnitsToSave(): AdUnit[] {
     const units = [
       ...this.site.adUnits.filter(adUnit => {

src/app/publisher/edit-site/edit-site-summary/edit-site-summary.component.html

@@ -1,4 +1,7 @@
-<app-edit-site-navigation [currentStep]="5" [medium]="site.medium"></app-edit-site-navigation>
+<app-edit-site-navigation
+  [currentStep]="5"
+  [medium]="site.medium"
+  [showPlacements]="showPlacements"></app-edit-site-navigation>
 <section class="homepage-view site-edit-summary container">
   <div class="ap-box">
     <div class="box-title">
@@ -114,7 +117,7 @@ <h3 class="ap-heading ap-heading--h3">3. Pops</h3>
       </div>
     </div>
 
-    <div class="ap-box site-edit-summary__poster-info">
+    <div *ngIf="showPlacements" class="ap-box site-edit-summary__poster-info">
       <div class="row align-center justify-between box-title">
         <h3 class="ap-heading ap-heading--h3">4. Placements</h3>
         <button

src/app/publisher/edit-site/edit-site-summary/edit-site-summary.component.ts

@@ -1,12 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute } from '@angular/router';
 
 import { AppState } from 'models/app-state.model';
 import { AdUnit, Site } from 'models/site.model';
 import { siteStatusEnum } from 'models/enum/site.enum';
 import { PUBLISHER_INSTRUCTION_LINK } from 'models/enum/link.enum';
-import { PublisherService } from 'publisher/publisher.service';
 import { AssetHelpersService } from 'common/asset-helpers.service';
 import { ADD_SITE_TO_SITES_FAILURE, AddSiteToSites } from 'store/publisher/publisher.actions';
 import { HandleSubscriptionComponent } from 'common/handle-subscription.component';
@@ -27,19 +26,21 @@ export class EditSiteSummaryComponent extends HandleSubscriptionComponent implem
   changeSaved: boolean = false;
   displayAds: boolean;
   PUBLISHER_INSTRUCTION_LINK = PUBLISHER_INSTRUCTION_LINK;
+  showPlacements: boolean;
 
   constructor(
     private store: Store<AppState>,
-    private publisherService: PublisherService,
     private assetHelpers: AssetHelpersService,
-    private router: Router,
     private route: ActivatedRoute,
     private actions: Actions
   ) {
     super();
   }
 
   ngOnInit() {
+    this.showPlacements = this.route.parent.snapshot.data.adUnitSizes.some(
+      adUnit => adUnit.type === adUnitTypesEnum.DISPLAY
+    );
     const lastSiteSubscription = this.store
       .select('state', 'publisher', 'lastEditedSite')
       .pipe(first())