feat-announcements.patch 5.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110
  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 66b9062..0a659dc 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 a73549a..fc95016 100644
  16. --- a/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  17. +++ b/src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
  18. @@ -115,4 +115,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. @@ -151,2 +155,4 @@ export class GettingStartedPage extends EditorPane {
  27. private gettingStartedList?: GettingStartedIndexList<IResolvedWalkthrough>;
  28. + private announcementList?: GettingStartedIndexList<AnnouncementEntry>;
  29. + private announcementData?: AnnouncementEntry[];
  30. private videoList?: GettingStartedIndexList<IWelcomePageStartEntry>;
  31. @@ -844,2 +850,3 @@ export class GettingStartedPage extends EditorPane {
  32. const gettingStartedList = this.buildGettingStartedWalkthroughsList();
  33. + const announcementList = await this.buildAnnouncementList();
  34. @@ -856,6 +863,6 @@ export class GettingStartedPage extends EditorPane {
  35. this.container.classList.remove('noVideos');
  36. - reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement());
  37. + reset(rightColumn, videoList?.getDomElement(), gettingStartedList.getDomElement(), announcementList.getDomElement());
  38. } else {
  39. this.container.classList.add('noVideos');
  40. - reset(rightColumn, gettingStartedList.getDomElement());
  41. + reset(rightColumn, gettingStartedList.getDomElement(), announcementList.getDomElement());
  42. }
  43. @@ -866,3 +873,3 @@ export class GettingStartedPage extends EditorPane {
  44. this.container.classList.remove('noVideos');
  45. - reset(rightColumn, videoList?.getDomElement());
  46. + reset(rightColumn, videoList?.getDomElement(), announcementList.getDomElement());
  47. }
  48. @@ -870,3 +877,3 @@ export class GettingStartedPage extends EditorPane {
  49. this.container.classList.add('noVideos');
  50. - reset(rightColumn);
  51. + reset(rightColumn, announcementList.getDomElement());
  52. }
  53. @@ -1023,2 +1030,55 @@ export class GettingStartedPage extends EditorPane {
  54. + private async buildAnnouncementList(): Promise<GettingStartedIndexList<AnnouncementEntry>> {
  55. + const renderAnnouncement = (announcement: AnnouncementEntry) => {
  56. + const { title, url } = announcement;
  57. + const li = $('li');
  58. +
  59. + const anchor: HTMLLinkElement = $('a');
  60. + anchor.href = url;
  61. + anchor.innerText = title;
  62. + anchor.target = '_blank';
  63. + li.appendChild(anchor);
  64. +
  65. + return li;
  66. + };
  67. +
  68. + if (this.announcementList) { this.announcementList.dispose(); }
  69. +
  70. + const announcementList = this.announcementList = new GettingStartedIndexList({
  71. + title: localize('announcements', "VSCodium Announcements"),
  72. + klass: 'announcements',
  73. + limit: 5,
  74. + empty: $('.empty-recent', {}, localize('noAnnouncements', "There are no current announcements.")),
  75. + renderElement: renderAnnouncement,
  76. + contextService: this.contextService
  77. + });
  78. +
  79. + if (!this.announcementData) {
  80. + const showExtras = this.configurationService.getValue<boolean>('workbench.welcomePage.extraAnnouncements');
  81. +
  82. + if (showExtras) {
  83. + const branch = this.productService.quality === 'insider' ? 'insider' : 'master';
  84. + await fetch(`https://raw.githubusercontent.com/VSCodium/vscodium/${branch}/announcements-extra.json`)
  85. + .then(async res => {
  86. + if (res.ok) {
  87. + var extraAnnouncements = await res.json() as AnnouncementEntry[];
  88. +
  89. + this.announcementData = [...extraAnnouncements, ...BUILTIN_ANNOUNCEMENTS];
  90. + } else {
  91. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  92. + }
  93. + })
  94. + .catch(err => {
  95. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  96. + });
  97. + } else {
  98. + this.announcementData = BUILTIN_ANNOUNCEMENTS;
  99. + }
  100. + }
  101. +
  102. + announcementList.setEntries(this.announcementData);
  103. +
  104. + return announcementList;
  105. + }
  106. +
  107. private buildStartList(): GettingStartedIndexList<IWelcomePageStartEntry> {