Merge pull request #721 from adshares/develop

v1.4.1

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.4.1] - 2019-11-22
+### Improved
+- Fill site name with domain
+### Fixed
+- Hide direct-link ad type
+
 ## [1.4.0] - 2019-11-22
 ### Added
 - Conversions definition
@@ -142,7 +148,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Advertiser features (Campaigns & Ads)
 - Publisher features (Sites & AdUnits)
 
-[Unreleased]: https://github.com/adshares/adpanel/compare/v1.4.0...develop
+[Unreleased]: https://github.com/adshares/adpanel/compare/v1.4.1...develop
+[1.4.1]: https://github.com/adshares/adpanel/compare/v1.4.0...v1.4.1
 [1.4.0]: https://github.com/adshares/adpanel/compare/v1.2.5...v1.4.0
 [1.2.5]: https://github.com/adshares/adpanel/compare/v1.2.4...v1.2.5
 [1.2.4]: https://github.com/adshares/adpanel/compare/v1.2.1...v1.2.4

src/app/advertiser/edit-campaign/edit-campaign-create-ads/edit-campaign-create-ads.component.ts

@@ -47,7 +47,7 @@ interface UploadingFile {
 })
 export class EditCampaignCreateAdsComponent extends HandleSubscription implements OnInit {
   adForms: FormGroup[] = [];
-  adTypes: string[] = enumToArray(adTypesEnum);
+  adTypes: string[] = ['image', 'html'];
   adSizes: string[] = enumToArray(adSizesEnum);
   adStatusesEnum = adStatusesEnum;
   ads: Ad[] = [];

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

@@ -48,7 +48,8 @@
             dwmth-form-input
             dwmth-form-input--full"
           type="text"
-          (blur)="extractDomain()"
+          (focus)="onDomainFocus()"
+          (blur)="onDomainBlur()"
           data-test="publisher-edit-site-basic-information-form-domain"
         >
         <span

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

@@ -34,6 +34,7 @@ export class EditSiteBasicInformationComponent extends HandleSubscription implem
   changesSaved: boolean = false;
   websiteNameLengthMax = EditSiteBasicInformationComponent.WEBSITE_NAME_LENGTH_MAX;
   websiteDomainLengthMax = EditSiteBasicInformationComponent.WEBSITE_DOMAIN_LENGTH_MAX;
+  private overwriteNameByDomain = false;
 
   constructor(
     private router: Router,
@@ -116,16 +117,19 @@ export class EditSiteBasicInformationComponent extends HandleSubscription implem
     };
   }
 
-  extractDomain(): void {
-    const url = this.siteBasicInfoForm.get('domain').value;
-
-    let domain = url.toLowerCase();
-    //remove protocol, user info and www subdomain
-    domain = domain.replace(/^(?:[a-z0-9+.-]+:\/\/)?(?:\/\/)?(?:.*@)?(?:www\.)?/i, "");
-    // remove port number, path, query string and fragment
-    domain = domain.replace(/(?::.*)?(?:\/.*)?(?:\?.*)?(?:#.*)?$/i, "");
+  onDomainFocus(): void {
+    const domain = this.siteBasicInfoForm.get('domain').value;
+    const name = this.siteBasicInfoForm.get('name').value;
+    this.overwriteNameByDomain = name.length == 0 || name == domain;
+  }
 
+  onDomainBlur(): void {
+    const domain = this.extractDomain(this.siteBasicInfoForm.get('domain').value);
     this.siteBasicInfoForm.get('domain').setValue(domain);
+    if (this.overwriteNameByDomain) {
+      this.siteBasicInfoForm.get('name').setValue(domain);
+    }
+    this.overwriteNameByDomain = false;
   }
 
   updateSite(): void {
@@ -187,4 +191,14 @@ export class EditSiteBasicInformationComponent extends HandleSubscription implem
     const filterValue = val.toLowerCase();
     return this.languages.filter(option => option.name.toLowerCase().includes(filterValue) || option.code.toLowerCase().includes(filterValue))
   }
+
+  extractDomain(url: string): string {
+    let domain = url.toLowerCase();
+    //remove protocol, user info and www subdomain
+    domain = domain.replace(/^(?:[a-z0-9+.-]+:\/\/)?(?:\/\/)?(?:.*@)?(?:www\.)?/i, "");
+    // remove port number, path, query string and fragment
+    domain = domain.replace(/(?::.*)?(?:\/.*)?(?:\?.*)?(?:#.*)?$/i, "");
+
+    return domain;
+  }
 }