Caio Almeida · Caio Almeida · Caio Almeida · Caio Almeida
Showing 11 changed files Show diff stats
src/app/layout/blocks/recent-activities-plugin-activities/activities/add_member_in_community.html
src/app/layout/blocks/recent-activities-plugin-activities/activities/create_article.html
src/app/layout/blocks/recent-activities-plugin-activities/activities/favorite_enterprise.html
src/app/layout/blocks/recent-activities-plugin-activities/activities/new_friendship.html
src/app/layout/blocks/recent-activities-plugin-activities/activities/upload_image.html
src/app/layout/blocks/recent-activities-plugin-activities/index.ts
src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component.spec.ts
src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component.ts
src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html
src/app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.scss
src/app/main/main.component.ts
@@ -0,0 +1 @@
+{{'joined the community' | translate}}
@@ -0,0 +1 @@
+{{'published an article:' | translate}} <a ng-href="{{ctrl.urlFor(activity.params.url)}}">{{activity.params.name}}</a>
@@ -0,0 +1 @@
+{{'favorited an enterprise:' | translate}} <a ng-href="{{ctrl.urlFor(activity.params.enterprise_url)}}">{{activity.params.enterprise_name}}</a>
@@ -0,0 +1,6 @@
+{{'has made new friends:' | translate}}<br /> 
+<span ng-repeat="name in activity.params.friend_name">
+  <a ng-href="{{ctrl.urlFor(activity.params.friend_url[$index])}}" ng-attr-title="{{name}}">
+    <img ng-src="{{activity.params.friend_profile_custom_icon[$index]}}" ng-attr-alt="{{name}}" />
+  </a>
+</span>
@@ -0,0 +1,6 @@
+{{'uploaded images:' | translate}}<br /> 
+<span ng-repeat="path in activity.params.thumbnail_path">
+  <a class="upimg" ng-href="{{ctrl.urlFor(activity.params.view_url[$index])}}" ng-style="{'background-image':'url({{path}})'}">
+    <span>{{path}}</span>
+  </a>
+</span>
@@ -0,0 +1,2 @@
+/* Module Index Entry - generated using the script npm run generate-index */
+export * from "./recent-activities-plugin-activities-block.component";
@@ -0,0 +1,56 @@
+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
+import {Provider, Input, provide, Component} from 'ng-forward';
+import {provideFilters} from '../../../../spec/helpers';
+import {RecentActivitiesPluginActivitiesBlockComponent} from './recent-activities-plugin-activities-block.component';
+import * as helpers from "./../../../../spec/helpers";
+
+const htmlTemplate: string = '<noosfero-recent-activities-plugin-activities-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-recent-activities-plugin-activities-block>';
+
+const tcb = new TestComponentBuilder();
+
+describe("Components", () => {
+    describe("Recent Activities Block Component", () => {
+
+        let settingsObj = {};
+        let person = <noosfero.Person>{ name: "Person" };
+        let mockedService = {
+            getApiContent: (block: noosfero.Block): any => {
+                return Promise.resolve({ activities: [{ verb: 'new_friendship' }], headers: (name: string) => { return name; } });
+            }
+        };
+        beforeEach(angular.mock.module("templates"));
+
+        let state = jasmine.createSpyObj("state", ["go"]);
+
+
+        function getProviders() {
+            return [
+                new Provider('$state', { useValue: state }),
+                new Provider('BlockService', {
+                    useValue: mockedService
+                })
+            ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
+        }
+        let componentClass: any = null;
+
+        function getComponent() {
+            @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [RecentActivitiesPluginActivitiesBlockComponent], providers: getProviders() })
+            class BlockContainerComponent {
+                block = { type: 'Block', settings: settingsObj };
+                owner = person;
+                constructor() {
+                }
+            }
+            return BlockContainerComponent;
+        }
+
+        it("get activities from block service", done => {
+            tcb.createAsync(getComponent()).then(fixture => {
+                let RecentActivitiesPluginActivitiesBlock: RecentActivitiesPluginActivitiesBlockComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
+                expect(RecentActivitiesPluginActivitiesBlock.activities[0]['verb']).toEqual('new_friendship');
+                done();
+            });
+        });
+
+    });
+});
@@ -0,0 +1,43 @@
+import {Component, Inject, Input} from "ng-forward";
+import {BlockService} from "../../../../lib/ng-noosfero-api/http/block.service";
+import {Arrays} from "./../../../../lib/util/arrays";
+
+@Component({
+    selector: "noosfero-recent-activities-plugin-activities-block",
+    templateUrl: 'app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html'
+})
+@Inject(BlockService, "$state")
+export class RecentActivitiesPluginActivitiesBlockComponent {
+
+    @Input() block: any;
+    @Input() owner: any;
+
+    profile: any;
+    activities: any;
+
+    constructor(private blockService: BlockService, private $state: any) { }
+
+    getActivityTemplate(activity: any) {
+        return 'app/layout/blocks/recent-activities-plugin-activities/activities/' + activity.verb + '.html';
+    }
+
+    urlFor(params: any) {
+        let url = '//' + params.host;
+        if (params.port) {
+              url += ':' + params.port;
+        }
+        url += '/' + params.profile + '/';
+        if (params.page) {
+            url += params.page.join('/');
+        }
+        return url;
+    }
+
+    ngOnInit() {
+        this.profile = this.owner;
+        this.activities = [];
+        this.blockService.getApiContent(this.block).then((content: any) => {
+            this.activities = content.activities;
+        });
+    }
+}
@@ -0,0 +1,14 @@
+<div class="deckgrid recent-activities-block">
+  <div ng-repeat="activity in ctrl.activities" class="a-card panel media">
+    <div class="header media-body">
+      <h5 class="title media-heading">
+        <a ng-href="/{{activity.user.identifier}}">{{activity.user.name}}</a>&nbsp;<ng-include src="ctrl.getActivityTemplate(activity)"></ng-include>
+      </h5>
+    </div>
+    <div class="subheader">
+      <span class="time">
+        <i class="fa fa-clock-o"></i> <span am-time-ago="activity.created_at | dateFormat"></span>
+      </span>
+    </div>
+  </div>
+</div>
@@ -0,0 +1,23 @@
+.col-md-2-5 .deckgrid[deckgrid]::before {
+  visibility: hidden;
+}
+
+.recent-activities-block {
+  img, .upimg {
+    padding: 1px;
+    border: 1px solid #ccc;
+    margin-right: 2px;
+    margin-top: 2px;
+  }
+
+  .upimg {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background-size: cover;
+
+    span {
+      display: none;
+    }
+  }
+}
@@ -20,6 +20,7 @@ import {StatisticsBlockComponent} from &quot;../layout/blocks/statistics/statistics-b
 import {PersonTagsPluginInterestsBlockComponent} from "../layout/blocks/person-tags-plugin-interests/person-tags-plugin-interests-block.component";
 import {TagsBlockComponent} from "../layout/blocks/tags/tags-block.component";
 import {CustomContentComponent} from "../profile/custom-content/custom-content.component";
+import {RecentActivitiesPluginActivitiesBlockComponent} from "../layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.component";
 import {MembersBlockComponent} from "../layout/blocks/members/members-block.component";
 import {CommunitiesBlockComponent} from "../layout/blocks/communities/communities-block.component";
@@ -87,7 +88,7 @@ export class EnvironmentContent {
  * @name main.Main
  * @requires AuthService, Session, Notification, ArticleBlog, ArticleView, Boxes, Block, LinkListBlock,
  * MainBlock, RecentDocumentsBlock, Navbar, ProfileImageBlock, MembersBlock,
- * NoosferoTemplate, DateFormat, RawHTMLBlock, PersonTagsPluginInterestsBlock
+ * NoosferoTemplate, DateFormat, RawHTMLBlock, PersonTagsPluginInterestsBlock, RecentActivitiesPluginActivitiesBlock,
  * @description
  *  The Main controller for the Noosfero Angular Theme application.
  *
@@ -106,7 +107,7 @@ export class EnvironmentContent {
         MainBlockComponent, RecentDocumentsBlockComponent, Navbar, SidebarComponent, ProfileImageBlockComponent,
         MembersBlockComponent, NoosferoTemplate, DateFormat, RawHTMLBlockComponent, StatisticsBlockComponent,
         LoginBlockComponent, CustomContentComponent, PermissionDirective, SearchFormComponent, SearchComponent,
-        PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, BlockComponent
+        PersonTagsPluginInterestsBlockComponent, TagsBlockComponent, RecentActivitiesPluginActivitiesBlockComponent, BlockComponent
     ].concat(plugins.mainComponents).concat(plugins.hotspots),
     providers: [AuthService, SessionService, NotificationService, BodyStateClassesService,
         "ngAnimate", "ngCookies", "ngStorage", "ngTouch",
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+{{'joined the community' \| translate}}
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+{{'published an article:' \| translate}} <a ng-href="{{ctrl.urlFor(activity.params.url)}}">{{activity.params.name}}</a>
	@@ -0,0 +1 @@		@@ -0,0 +1 @@
		1	+{{'favorited an enterprise:' \| translate}} <a ng-href="{{ctrl.urlFor(activity.params.enterprise_url)}}">{{activity.params.enterprise_name}}</a>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+{{'has made new friends:' \| translate}}<br />
	2	+<span ng-repeat="name in activity.params.friend_name">
	3	+ <a ng-href="{{ctrl.urlFor(activity.params.friend_url[$index])}}" ng-attr-title="{{name}}">
	4	+ <img ng-src="{{activity.params.friend_profile_custom_icon[$index]}}" ng-attr-alt="{{name}}" />
	5	+ </a>
	6	+</span>
@@ -0,0 +1,6 @@		@@ -0,0 +1,6 @@
	1	+{{'uploaded images:' \| translate}}<br />
	2	+<span ng-repeat="path in activity.params.thumbnail_path">
	3	+ <a class="upimg" ng-href="{{ctrl.urlFor(activity.params.view_url[$index])}}" ng-style="{'background-image':'url({{path}})'}">
	4	+ <span>{{path}}</span>
	5	+ </a>
	6	+</span>
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+/* Module Index Entry - generated using the script npm run generate-index */
	2	+export * from "./recent-activities-plugin-activities-block.component";
@@ -0,0 +1,56 @@		@@ -0,0 +1,56 @@
	1	+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
	2	+import {Provider, Input, provide, Component} from 'ng-forward';
	3	+import {provideFilters} from '../../../../spec/helpers';
	4	+import {RecentActivitiesPluginActivitiesBlockComponent} from './recent-activities-plugin-activities-block.component';
	5	+import * as helpers from "./../../../../spec/helpers";
	6	+
	7	+const htmlTemplate: string = '<noosfero-recent-activities-plugin-activities-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-recent-activities-plugin-activities-block>';
	8	+
	9	+const tcb = new TestComponentBuilder();
	10	+
	11	+describe("Components", () => {
	12	+ describe("Recent Activities Block Component", () => {
	13	+
	14	+ let settingsObj = {};
	15	+ let person = <noosfero.Person>{ name: "Person" };
	16	+ let mockedService = {
	17	+ getApiContent: (block: noosfero.Block): any => {
	18	+ return Promise.resolve({ activities: [{ verb: 'new_friendship' }], headers: (name: string) => { return name; } });
	19	+ }
	20	+ };
	21	+ beforeEach(angular.mock.module("templates"));
	22	+
	23	+ let state = jasmine.createSpyObj("state", ["go"]);
	24	+
	25	+
	26	+ function getProviders() {
	27	+ return [
	28	+ new Provider('$state', { useValue: state }),
	29	+ new Provider('BlockService', {
	30	+ useValue: mockedService
	31	+ })
	32	+ ].concat(provideFilters("truncateFilter", "stripTagsFilter"));
	33	+ }
	34	+ let componentClass: any = null;
	35	+
	36	+ function getComponent() {
	37	+ @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [RecentActivitiesPluginActivitiesBlockComponent], providers: getProviders() })
	38	+ class BlockContainerComponent {
	39	+ block = { type: 'Block', settings: settingsObj };
	40	+ owner = person;
	41	+ constructor() {
	42	+ }
	43	+ }
	44	+ return BlockContainerComponent;
	45	+ }
	46	+
	47	+ it("get activities from block service", done => {
	48	+ tcb.createAsync(getComponent()).then(fixture => {
	49	+ let RecentActivitiesPluginActivitiesBlock: RecentActivitiesPluginActivitiesBlockComponent = fixture.debugElement.componentViewChildren[0].componentInstance;
	50	+ expect(RecentActivitiesPluginActivitiesBlock.activities[0]['verb']).toEqual('new_friendship');
	51	+ done();
	52	+ });
	53	+ });
	54	+
	55	+ });
	56	+});
@@ -0,0 +1,43 @@		@@ -0,0 +1,43 @@
	1	+import {Component, Inject, Input} from "ng-forward";
	2	+import {BlockService} from "../../../../lib/ng-noosfero-api/http/block.service";
	3	+import {Arrays} from "./../../../../lib/util/arrays";
	4	+
	5	+@Component({
	6	+ selector: "noosfero-recent-activities-plugin-activities-block",
	7	+ templateUrl: 'app/layout/blocks/recent-activities-plugin-activities/recent-activities-plugin-activities-block.html'
	8	+})
	9	+@Inject(BlockService, "$state")
	10	+export class RecentActivitiesPluginActivitiesBlockComponent {
	11	+
	12	+ @Input() block: any;
	13	+ @Input() owner: any;
	14	+
	15	+ profile: any;
	16	+ activities: any;
	17	+
	18	+ constructor(private blockService: BlockService, private $state: any) { }
	19	+
	20	+ getActivityTemplate(activity: any) {
	21	+ return 'app/layout/blocks/recent-activities-plugin-activities/activities/' + activity.verb + '.html';
	22	+ }
	23	+
	24	+ urlFor(params: any) {
	25	+ let url = '//' + params.host;
	26	+ if (params.port) {
	27	+ url += ':' + params.port;
	28	+ }
	29	+ url += '/' + params.profile + '/';
	30	+ if (params.page) {
	31	+ url += params.page.join('/');
	32	+ }
	33	+ return url;
	34	+ }
	35	+
	36	+ ngOnInit() {
	37	+ this.profile = this.owner;
	38	+ this.activities = [];
	39	+ this.blockService.getApiContent(this.block).then((content: any) => {
	40	+ this.activities = content.activities;
	41	+ });
	42	+ }
	43	+}
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+<div class="deckgrid recent-activities-block">
	2	+ <div ng-repeat="activity in ctrl.activities" class="a-card panel media">
	3	+ <div class="header media-body">
	4	+ <h5 class="title media-heading">
	5	+ <a ng-href="/{{activity.user.identifier}}">{{activity.user.name}}</a> <ng-include src="ctrl.getActivityTemplate(activity)"></ng-include>
	6	+ </h5>
	7	+ </div>
	8	+ <div class="subheader">
	9	+ <span class="time">
	10	+ <i class="fa fa-clock-o"></i> <span am-time-ago="activity.created_at \| dateFormat"></span>
	11	+ </span>
	12	+ </div>
	13	+ </div>
	14	+</div>
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+.col-md-2-5 .deckgrid[deckgrid]::before {
	2	+ visibility: hidden;
	3	+}
	4	+
	5	+.recent-activities-block {
	6	+ img, .upimg {
	7	+ padding: 1px;
	8	+ border: 1px solid #ccc;
	9	+ margin-right: 2px;
	10	+ margin-top: 2px;
	11	+ }
	12	+
	13	+ .upimg {
	14	+ display: inline-block;
	15	+ width: 20px;
	16	+ height: 20px;
	17	+ background-size: cover;
	18	+
	19	+ span {
	20	+ display: none;
	21	+ }
	22	+ }
	23	+}