feat-announcements.patch 4.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101
  1. diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
  2. index c581ac0..f11c0f0 100644
  3. --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
  4. +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
  5. @@ -319,2 +319,8 @@ configurationRegistry.registerConfiguration({
  6. },
  7. + 'workbench.welcomePage.extraAnnouncements': {
  8. + scope: ConfigurationScope.MACHINE,
  9. + type: 'boolean',
  10. + default: true,
  11. + description: localize('workbench.welcomePage.extraAnnouncements', "When enabled, the get started page loads additional announcements from !!APP_NAME!!'s repository.")
  12. + },
  13. 'workbench.startupEditor': {
  14. diff --git a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  15. index 664c55b..43f9e2e 100644
  16. --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  17. +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  18. @@ -113,4 +113,8 @@ type GettingStartedActionEvent = {
  19. type RecentEntry = (IRecentFolder | IRecentWorkspace) & { id: string };
  20. +type AnnouncementEntry = { id: string, title: string, url: string };
  21. const REDUCED_MOTION_KEY = 'workbench.welcomePage.preferReducedMotion';
  22. +
  23. +const BUILTIN_ANNOUNCEMENTS: AnnouncementEntry[] = [/* BUILTIN_ANNOUNCEMENTS */];
  24. +
  25. export class GettingStartedPage extends EditorPane {
  26. @@ -149,2 +153,4 @@ export class GettingStartedPage extends EditorPane {
  27. private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
  28. + private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
  29. + private announcementData?: AnnouncementEntry[];
  30. @@ -812,2 +818,3 @@ export class GettingStartedPage extends EditorPane {
  31. const gettingStartedList = this.buildGettingStartedWalkthroughsList();
  32. + const announcementList = await this.buildAnnouncementList();
  33. @@ -822,3 +829,3 @@ export class GettingStartedPage extends EditorPane {
  34. this.container.classList.remove('noWalkthroughs');
  35. - reset(rightColumn, gettingStartedList.getDomElement());
  36. + reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
  37. }
  38. @@ -826,3 +833,3 @@ export class GettingStartedPage extends EditorPane {
  39. this.container.classList.add('noWalkthroughs');
  40. - reset(rightColumn);
  41. + reset(rightColumn, announcementList.getDomElement());
  42. }
  43. @@ -978,2 +985,55 @@ export class GettingStartedPage extends EditorPane {
  44. + private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
  45. + const renderAnnouncement = (announcement: AnnouncementEntry) => {
  46. + const { title, url } = announcement;
  47. + const li = $('li');
  48. +
  49. + const anchor: HTMLLinkElement = $('a');
  50. + anchor.href = url;
  51. + anchor.innerText = title;
  52. + anchor.target = '_blank';
  53. + li.appendChild(anchor);
  54. +
  55. + return li;
  56. + };
  57. +
  58. + if (this.announcementList) { this.announcementList.dispose(); }
  59. +
  60. + const announcementList = this.announcementList = new GettingStartedIndexList({
  61. + title: localize('announcements', "!!APP_NAME!! Announcements"),
  62. + klass: 'announcements',
  63. + limit: 5,
  64. + empty: $('.empty-recent', {}, localize('noAnnouncements', "There are no current announcements.")),
  65. + renderElement: renderAnnouncement,
  66. + contextService: this.contextService
  67. + });
  68. +
  69. + if (!this.announcementData) {
  70. + const showExtras = this.configurationService.getValue<boolean>('workbench.welcomePage.extraAnnouncements');
  71. +
  72. + if (showExtras) {
  73. + const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
  74. + await fetch(`https://raw.githubusercontent.com/!!GH_REPO_PATH!!/${branch}/announcements-extra.json`)
  75. + .then(async res => {
  76. + if (res.ok) {
  77. + var extraAnnouncements = await res.json() as AnnouncementEntry[];
  78. +
  79. + this.announcementData = [...extraAnnouncements, ...BUILTIN_ANNOUNCEMENTS];
  80. + } else {
  81. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  82. + }
  83. + })
  84. + .catch(err => {
  85. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  86. + });
  87. + } else {
  88. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  89. + }
  90. + }
  91. +
  92. + announcementList.setEntries(this.announcementData);
  93. +
  94. + return announcementList;
  95. + }
  96. +
  97. private buildStartList(): GettingStartedIndexList<IWelcomePageStartEntry> {