.gitlab-ci.yml

@@ -253,7 +253,7 @@ review:start:
   image: minds/helm-eks:latest
   script:
     - aws eks update-kubeconfig --name=sandbox
-    - git clone --branch=epic/SSR https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
+    - git clone --branch=master https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/minds/helm-charts.git
     - "helm upgrade \
       --install \
       --reuse-values \

src/app/common/components/post-menu/post-menu.module.ts

@@ -5,11 +5,12 @@ import { PostMenuComponent } from './post-menu.component';
 import { ModalsModule } from '../../../modules/modals/modals.module';
 import { FormsModule } from '@angular/forms';
 import { CommonModule } from '../../common.module';
+import { PostMenuV2Component } from './v2/menu.component';
 
 @NgModule({
   imports: [CommonModule, NgCommonModule, FormsModule, ModalsModule],
-  exports: [PostMenuComponent],
-  declarations: [PostMenuComponent],
+  exports: [PostMenuComponent, PostMenuV2Component],
+  declarations: [PostMenuComponent, PostMenuV2Component],
   providers: [],
   entryComponents: [PostMenuComponent],
 })

src/app/modules/newsfeed/activity/activity.component.html

-<m-activity__ownerBlock
-  *ngIf="service.displayOptions.showOwnerBlock"
-></m-activity__ownerBlock>
+<m-activity__ownerBlock *ngIf="service.displayOptions.showOwnerBlock">
+  <ng-container class="m-activityOwnerBlock__right">
+    <m-activity__menu></m-activity__menu>
+  </ng-container>
+</m-activity__ownerBlock>
 
 <m-activity__content
   *ngIf="service.canShowContent$ | async"

src/app/modules/newsfeed/activity/activity.module.ts

@@ -17,6 +17,8 @@ import { MediaModule } from '../../media/media.module';
 import { ActivityToolbarComponent } from './toolbar/toolbar.component';
 import { ModalsModule } from '../../modals/modals.module';
 import { LegacyModule } from '../../legacy/legacy.module';
+import { ActivityMenuComponent } from './menu/menu.component';
+import { PostMenuModule } from '../../../common/components/post-menu/post-menu.module';
 
 @NgModule({
   imports: [
@@ -31,12 +33,14 @@ import { LegacyModule } from '../../legacy/legacy.module';
     VideoModule,
     ModalsModule,
     LegacyModule, // For remind button
+    PostMenuModule,
   ],
   declarations: [
     ActivityComponent,
     ActivityOwnerBlockComponent,
     ActivityContentComponent,
     ActivityToolbarComponent,
+    ActivityMenuComponent,
   ],
   providers: [],
   exports: [ActivityComponent],

src/app/modules/newsfeed/activity/activity.service.ts

@@ -9,6 +9,7 @@ export type ActivityDisplayOptions = {
   showComments: boolean;
   showOnlyCommentsInput: boolean;
   showToolbar: boolean;
+  showBoostMenuOptions: boolean;
   showEditedTag: boolean;
   fixedHeight: boolean;
 };
@@ -29,6 +30,7 @@ export type ActivityEntity = {
   time_created: number;
   edited: boolean;
   modal_source_url?: string;
+  ephemeral?: boolean;
 };
 
 @Injectable()
@@ -61,6 +63,7 @@ export class ActivityService {
     showComments: true,
     showOnlyCommentsInput: true,
     showToolbar: true,
+    showBoostMenuOptions: false,
     showEditedTag: false,
     fixedHeight: false,
   };

src/app/modules/newsfeed/activity/owner-block/owner-block.component.html

@@ -56,6 +56,10 @@
   </ng-container>
 </div>
 
+<div class=".m-activityOwnerBlock__right">
+  <ng-content select=".m-activityOwnerBlock__right"></ng-content>
+</div>
+
 <ng-template #boostedTag>
   <div
     class="mdl-card__supporting-text is-boosted"