From a38321e3bbaa4c32696b2e8910a6938fd0807be2 Mon Sep 17 00:00:00 2001 From: Manuel Rojas Date: Mon, 5 Feb 2024 20:29:00 -0600 Subject: [PATCH] #27479 Adding Vanity URLs (#27515) --- .../dot-starter/dot-starter.component.scss | 1 + .../dot-toolbar-announcements.component.scss | 5 ++- ...ot-toolbar-announcements.component.spec.ts | 6 ++- .../store/dot-announcements.store.spec.ts | 4 +- .../store/dot-announcements.store.ts | 38 ++++++++++++++----- .../WEB-INF/messages/Language.properties | 6 ++- 6 files changed, 45 insertions(+), 15 deletions(-) diff --git a/core-web/apps/dotcms-ui/src/app/portlets/dot-starter/dot-starter.component.scss b/core-web/apps/dotcms-ui/src/app/portlets/dot-starter/dot-starter.component.scss index dd7ddeb0ed79..d1aff39f8c87 100644 --- a/core-web/apps/dotcms-ui/src/app/portlets/dot-starter/dot-starter.component.scss +++ b/core-web/apps/dotcms-ui/src/app/portlets/dot-starter/dot-starter.component.scss @@ -7,6 +7,7 @@ $number-link-icon-size: 2.28rem; font-size: $font-size-md; height: 100%; overflow: auto; + background-color: $white; hr { border-top: 1px solid $color-palette-gray-300; diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.scss b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.scss index a6966dd271fe..37b6e0369f21 100644 --- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.scss +++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.scss @@ -71,10 +71,11 @@ } .announcements__about { - display: flex; + display: grid; flex-direction: column; gap: $spacing-3; - margin: $spacing-3 0; + margin: $spacing-3; + grid-template-columns: 1fr 1fr; } .announcements__link { diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts index 8fcd73fa91b7..5f25dce6468a 100644 --- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts +++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/dot-toolbar-announcements.component.spec.ts @@ -22,9 +22,13 @@ describe('DotToolbarAnnouncementsComponent', () => { 'announcements.knowledge.contact.us': 'Contact Us', 'announcements.contact.customer.support': 'Customer Support', 'announcements.contact.professional.services': 'Professional Services', + 'announcements.contact.request.feature': 'Request a Feature', + 'announcements.contact.report.bug': 'Report a Bug', 'announcements.knowledge.center.documentation': 'Documentation', 'announcements.knowledge.center.blog': 'Blog', - 'announcements.knowledge.center.forum': 'User Forums' + 'announcements.knowledge.center.github': 'GitHub Repository', + 'announcements.knowledge.center.training': 'Online Training', + 'announcements.knowledge.center.forum': 'Forum' }); const siteServiceMock = new SiteServiceMock(); const createComponent = createComponentFactory({ diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.spec.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.spec.ts index 6b7dce34bce2..691141a3df3f 100644 --- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.spec.ts +++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.spec.ts @@ -51,7 +51,7 @@ describe('AnnouncementsStore', () => { announcementDateAsISO8601: '2024-01-31T17:51', identifier: 'test-announcement-id', inode: '123', - url: 'https://www.example.com?utm_source=platform&utm_medium=demo.dotcms.com&utm_campaign=announcement' + url: 'https://www.example.com?utm_source=platform&utm_medium=announcement&utm_campaign=demo.dotcms.com' } ]; spectator.service.load(); @@ -86,7 +86,7 @@ describe('AnnouncementsStore', () => { spectator.service.load(); spectator.service.state$.subscribe((state) => { expect(state.announcements[0].url).toBe( - 'https://www.example.com?utm_source=platform&utm_medium=demo.dotcms.com&utm_campaign=announcement' + 'https://www.example.com?utm_source=platform&utm_medium=announcement&utm_campaign=demo.dotcms.com' ); done(); }); diff --git a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.ts b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.ts index b076fb18c01f..2460e4fd4e59 100644 --- a/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.ts +++ b/core-web/apps/dotcms-ui/src/app/view/components/dot-toolbar/components/dot-toolbar-announcements/store/dot-announcements.store.ts @@ -84,18 +84,28 @@ export class AnnouncementsStore extends ComponentStore { return [ { id: '1', - url: `https://www.dotcms.com/docs/latest/table-of-contents?${state.utmParameters}`, + url: `https://www.dotcms.com/announcement-menu-documentation?${state.utmParameters}`, label: this.dotMessageService.get('announcements.knowledge.center.documentation') }, { + url: `https://www.dotcms.com/announcement-menu-user-forum?${state.utmParameters}`, id: '2', - label: this.dotMessageService.get('announcements.knowledge.center.blog'), - url: `https://www.dotcms.com/blog/?${state.utmParameters}` + label: this.dotMessageService.get('announcements.knowledge.center.forum') }, { - url: 'https://groups.google.com/g/dotcms', + url: `https://www.dotcms.com/announcement-menu-online-training?${state.utmParameters}`, id: '3', - label: this.dotMessageService.get('announcements.knowledge.center.forum') + label: this.dotMessageService.get('announcements.knowledge.center.training') + }, + { + id: '4', + label: this.dotMessageService.get('announcements.knowledge.center.blog'), + url: `https://www.dotcms.com/announcement-menu-dotcms-blog?${state.utmParameters}` + }, + { + url: `https://www.dotcms.com/announcement-menu-github-repository?${state.utmParameters}`, + id: '5', + label: this.dotMessageService.get('announcements.knowledge.center.github') } ]; }); @@ -104,19 +114,29 @@ export class AnnouncementsStore extends ComponentStore { return [ { label: this.dotMessageService.get('announcements.contact.customer.support'), - url: `https://www.dotcms.com/services/support/?${state.utmParameters}`, + url: `https://www.dotcms.com/announcement-menu-customer-support?${state.utmParameters}`, id: '1' }, { id: '2', label: this.dotMessageService.get('announcements.contact.professional.services'), - url: `https://www.dotcms.com/services/professional-services/?${state.utmParameters}` + url: `https://www.dotcms.com/announcement-menu-professional-services?${state.utmParameters}` + }, + { + label: this.dotMessageService.get('announcements.contact.request.feature'), + url: `https://www.dotcms.com/announcement-menu-request-a-feature?${state.utmParameters}`, + id: '3' + }, + { + id: '4', + label: this.dotMessageService.get('announcements.contact.report.bug'), + url: `https://www.dotcms.com/announcement-menu-report-a-bug?${state.utmParameters}` } ]; }); readonly selectLinkToDotCms: Signal = this.selectSignal((state) => { - return `https://dotcms.com/?${state.utmParameters}`; + return `https://www.dotcms.com/announcement-menu-show-all?${state.utmParameters}`; }); readonly markAnnouncementsAsRead = this.updater((state) => { @@ -139,7 +159,7 @@ export class AnnouncementsStore extends ComponentStore { }); private generateUtmQueryString(): string { - return `utm_source=platform&utm_medium=${this.siteService.currentSite.hostname}&utm_campaign=announcement`; + return `utm_source=platform&utm_medium=announcement&utm_campaign=${this.siteService.currentSite.hostname}`; } private appendUtmParameters(announcements: Announcement[]): Announcement[] { diff --git a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties index fbb3ce236f1a..787c7162001c 100644 --- a/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties +++ b/dotCMS/src/main/webapp/WEB-INF/messages/Language.properties @@ -2969,9 +2969,13 @@ announcements.knowledge.center=Knowledge Center announcements.knowledge.contact.us=Contact Us announcements.contact.customer.support=Customer Support announcements.contact.professional.services=Professional Services +announcements.contact.request.feature=Request a Feature +announcements.contact.report.bug=Report a Bug announcements.knowledge.center.documentation=Documentation announcements.knowledge.center.blog=Blog -announcements.knowledge.center.forum=User Forums +announcements.knowledge.center.github=GitHub Repository +announcements.knowledge.center.training=Online Training +announcements.knowledge.center.forum=Forum November=November num-of-hits=# of Hits num-of-votes=# of Votes