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 fc6c589..ed0df30 100644
  3. --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
  4. +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
  5. @@ -315,2 +315,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 VSCodium'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 99d6a26..b42713d 100644
  16. --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  17. +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  18. @@ -114,4 +114,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. @@ -150,2 +154,4 @@ export class GettingStartedPage extends EditorPane {
  27. private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
  28. + private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
  29. + private announcementData?: AnnouncementEntry[];
  30. @@ -809,2 +815,3 @@ export class GettingStartedPage extends EditorPane {
  31. const gettingStartedList = this.buildGettingStartedWalkthroughsList();
  32. + const announcementList = await this.buildAnnouncementList();
  33. @@ -819,3 +826,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. @@ -823,3 +830,3 @@ export class GettingStartedPage extends EditorPane {
  39. this.container.classList.add('noWalkthroughs');
  40. - reset(rightColumn);
  41. + reset(rightColumn, announcementList.getDomElement());
  42. @@ -976,2 +983,55 @@ export class GettingStartedPage extends EditorPane {
  43. + private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
  44. + const renderAnnouncement = (announcement: AnnouncementEntry) => {
  45. + const { title, url } = announcement;
  46. + const li = $('li');
  47. +
  48. + const anchor: HTMLLinkElement = $('a');
  49. + anchor.href = url;
  50. + anchor.innerText = title;
  51. + anchor.target = '_blank';
  52. + li.appendChild(anchor);
  53. +
  54. + return li;
  55. + };
  56. +
  57. + if (this.announcementList) { this.announcementList.dispose(); }
  58. +
  59. + const announcementList = this.announcementList = new GettingStartedIndexList({
  60. + title: localize('announcements', "VSCodium Announcements"),
  61. + klass: 'announcements',
  62. + limit: 5,
  63. + empty: $('.empty-recent', {}, localize('noAnnouncements', "There are no current announcements.")),
  64. + renderElement: renderAnnouncement,
  65. + contextService: this.contextService
  66. + });
  67. +
  68. + if (!this.announcementData) {
  69. + const showExtras = this.configurationService.getValue<boolean>('workbench.welcomePage.extraAnnouncements');
  70. +
  71. + if (showExtras) {
  72. + const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
  73. + await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`)
  74. + .then(async res => {
  75. + if (res.ok) {
  76. + var extraAnnouncements = await res.json() as AnnouncementEntry[];
  77. +
  78. + this.announcementData = [...extraAnnouncements, ...BUILTIN_ANNOUNCEMENTS];
  79. + } else {
  80. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  81. + }
  82. + })
  83. + .catch(err => {
  84. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  85. + });
  86. + } else {
  87. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  88. + }
  89. + }
  90. +
  91. + announcementList.setEntries(this.announcementData);
  92. +
  93. + return announcementList;
  94. + }
  95. +
  96. private buildStartList(): GettingStartedIndexList<IWelcomePageStartEntry> {