refactoring link list block

Leandro Santos
1 parent 8c7b12aa
Showing 10 changed files with 128 additions and 128 deletions Show diff stats
src/app/layout/blocks/link-list/index.ts
src/app/layout/blocks/link-list/link-list-block.component.spec.ts
src/app/layout/blocks/link-list/link-list-block.component.ts
src/app/layout/blocks/link-list/link-list-block.html
src/app/layout/blocks/link-list/link-list-block.scss
src/app/layout/blocks/link-list/link-list.component.spec.ts
src/app/layout/blocks/link-list/link-list.component.ts
src/app/layout/blocks/link-list/link-list.html
src/app/layout/blocks/link-list/link-list.scss
src/app/main/main.component.ts
 /* Module Index Entry - generated using the script npm run generate-index */
-export * from "./link-list.component";
+export * from "./link-list-block.component";
@@ -0,0 +1,65 @@
+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
+import {Pipe, Input, provide, Component} from 'ng-forward';
+import {provideFilters} from '../../../../spec/helpers';
+
+import {LinkListBlockComponent} from './link-list-block.component';
+
+const tcb = new TestComponentBuilder();
+
+const htmlTemplate: string = '<noosfero-link-list-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-link-list-block>';
+
+
+describe("Components", () => {
+
+    describe("Link List Block Component", () => {
+
+        beforeEach(angular.mock.module("templates"));
+
+        it("receives the block and the owner as inputs", done => {
+
+            // Creating a container component (BlockContainerComponent) to include
+            // the component under test (Block)
+            @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlockComponent] })
+            class BlockContainerComponent {
+                block = { type: 'Block' };
+                owner = { name: 'profile-name' };
+                constructor() {
+                }
+            }
+
+            // uses the TestComponentBuilder instance to initialize the component
+            // .overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
+            tcb.createAsync(BlockContainerComponent).then(fixture => {
+                // and here we can inspect and run the test assertions
+                let myComponent: LinkListBlockComponent = fixture.componentInstance;
+
+                // assure the block object inside the Block matches
+                // the provided through the parent component
+                expect(myComponent.block.type).toEqual("Block");
+                expect(myComponent.owner.name).toEqual("profile-name");
+                done();
+            });
+        });
+
+
+        it("display links stored in block settings", done => {
+
+            @Component({
+                selector: 'test-container-component',
+                template: htmlTemplate,
+                directives: [LinkListBlockComponent],
+                providers: provideFilters("noosferoTemplateFilter")
+            })
+            class CustomBlockType {
+                block: any = { settings: { links: [{ name: 'link1', address: 'address1' }, { name: 'link2', address: 'address2' }] } };
+                owner: any = { name: 'profile-name' };
+            }
+            tcb.createAsync(CustomBlockType).then(fixture => {
+                expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
+                done();
+            });
+        });
+
+    });
+
+});
@@ -0,0 +1,20 @@
+import {Component, Input} from "ng-forward";
+
+@Component({
+    selector: "noosfero-link-list-block",
+    templateUrl: "app/layout/blocks/link-list/link-list-block.html"
+})
+export class LinkListBlockComponent {
+
+    @Input() block: any;
+    @Input() owner: any;
+
+    links: any;
+
+    ngOnInit() {
+        if (this.block && this.block.settings) {
+            this.links = this.block.settings.links;
+        }
+    }
+
+}
@@ -0,0 +1,7 @@
+<div class="link-list-block">
+  <div ng-repeat="link in ctrl.links">
+    <a ng-href="{{link.address | noosferoTemplate:{profile: ctrl.owner.identifier} }}">
+      <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
+    </a>
+  </div>
+</div>
@@ -0,0 +1,34 @@
+.icon-event {
+  @extend .fa-calendar;
+}
+.icon-photos {
+  @extend .fa-photo;
+}
+.icon-edit {
+  @extend .fa-edit;
+}
+.icon-ok {
+  @extend .fa-check;
+}
+.icon-send {
+  @extend .fa-send-o;
+}
+.icon-menu-people {
+  @extend .fa-user;
+}
+.icon-forum {
+  @extend .fa-users;
+}
+.icon-new {
+  @extend .fa-file-o;
+}
+.icon-save {
+  @extend .fa-save;
+}
+
+.link-list-block {
+  a i {
+    line-height: 25px;
+    color: #949494;
+  }
+}
@@ -1,65 +0,0 @@
-import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
-import {Pipe, Input, provide, Component} from 'ng-forward';
-import {provideFilters} from '../../../../spec/helpers';
-
-import {LinkListBlockComponent} from './link-list.component';
-
-const tcb = new TestComponentBuilder();
-
-const htmlTemplate: string = '<noosfero-link-list-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-link-list-block>';
-
-
-describe("Components", () => {
-
-    describe("Link List Block Component", () => {
-
-        beforeEach(angular.mock.module("templates"));
-
-        it("receives the block and the owner as inputs", done => {
-
-            // Creating a container component (BlockContainerComponent) to include
-            // the component under test (Block)
-            @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlockComponent] })
-            class BlockContainerComponent {
-                block = { type: 'Block' };
-                owner = { name: 'profile-name' };
-                constructor() {
-                }
-            }
-
-            // uses the TestComponentBuilder instance to initialize the component
-            // .overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
-            tcb.createAsync(BlockContainerComponent).then(fixture => {
-                // and here we can inspect and run the test assertions
-                let myComponent: LinkListBlockComponent = fixture.componentInstance;
-
-                // assure the block object inside the Block matches
-                // the provided through the parent component
-                expect(myComponent.block.type).toEqual("Block");
-                expect(myComponent.owner.name).toEqual("profile-name");
-                done();
-            });
-        });
-
-
-        it("display links stored in block settings", done => {
-
-            @Component({
-                selector: 'test-container-component',
-                template: htmlTemplate,
-                directives: [LinkListBlockComponent],
-                providers: provideFilters("noosferoTemplateFilter")
-            })
-            class CustomBlockType {
-                block: any = { settings: { links: [{ name: 'link1', address: 'address1' }, { name: 'link2', address: 'address2' }] } };
-                owner: any = { name: 'profile-name' };
-            }
-            tcb.createAsync(CustomBlockType).then(fixture => {
-                expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
-                done();
-            });
-        });
-
-    });
-
-});
 \ No newline at end of file
@@ -1,20 +0,0 @@
-import {Component, Input} from "ng-forward";
-
-@Component({
-    selector: "noosfero-link-list-block",
-    templateUrl: "app/layout/blocks/link-list/link-list.html"
-})
-export class LinkListBlockComponent {
-
-    @Input() block: any;
-    @Input() owner: any;
-
-    links: any;
-
-    ngOnInit() {
-        if (this.block && this.block.settings) {
-            this.links = this.block.settings.links;
-        }
-    }
-
-}
@@ -1,7 +0,0 @@
-<div class="link-list-block">
-  <div ng-repeat="link in ctrl.links">
-    <a ng-href="{{link.address | noosferoTemplate:{profile: ctrl.owner.identifier} }}">
-      <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
-    </a>
-  </div>
-</div>
@@ -1,34 +0,0 @@
-.icon-event {
-  @extend .fa-calendar;
-}
-.icon-photos {
-  @extend .fa-photo;
-}
-.icon-edit {
-  @extend .fa-edit;
-}
-.icon-ok {
-  @extend .fa-check;
-}
-.icon-send {
-  @extend .fa-send-o;
-}
-.icon-menu-people {
-  @extend .fa-user;
-}
-.icon-forum {
-  @extend .fa-users;
-}
-.icon-new {
-  @extend .fa-file-o;
-}
-.icon-save {
-  @extend .fa-save;
-}
-
-.link-list-block {
-  a i {
-    line-height: 25px;
-    color: #949494;
-  }
-}
@@ -10,7 +10,7 @@ import {BlockComponent} from &quot;../layout/blocks/block.component&quot;;
 import {EnvironmentComponent} from "../environment/environment.component";
 import {EnvironmentHomeComponent} from "../environment/environment-home.component";
 import {PeopleBlockComponent} from "../layout/blocks/people-block/people-block.component";
-import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list.component";
+import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list-block.component";
 import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";
 import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";
 import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html.component";
1	/* Module Index Entry - generated using the script npm run generate-index */	1	/* Module Index Entry - generated using the script npm run generate-index */
2	-export * from "./link-list.component";	2	+export * from "./link-list-block.component";
@@ -0,0 +1,65 @@		@@ -0,0 +1,65 @@
	1	+import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
	2	+import {Pipe, Input, provide, Component} from 'ng-forward';
	3	+import {provideFilters} from '../../../../spec/helpers';
	4	+
	5	+import {LinkListBlockComponent} from './link-list-block.component';
	6	+
	7	+const tcb = new TestComponentBuilder();
	8	+
	9	+const htmlTemplate: string = '<noosfero-link-list-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-link-list-block>';
	10	+
	11	+
	12	+describe("Components", () => {
	13	+
	14	+ describe("Link List Block Component", () => {
	15	+
	16	+ beforeEach(angular.mock.module("templates"));
	17	+
	18	+ it("receives the block and the owner as inputs", done => {
	19	+
	20	+ // Creating a container component (BlockContainerComponent) to include
	21	+ // the component under test (Block)
	22	+ @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlockComponent] })
	23	+ class BlockContainerComponent {
	24	+ block = { type: 'Block' };
	25	+ owner = { name: 'profile-name' };
	26	+ constructor() {
	27	+ }
	28	+ }
	29	+
	30	+ // uses the TestComponentBuilder instance to initialize the component
	31	+ // .overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
	32	+ tcb.createAsync(BlockContainerComponent).then(fixture => {
	33	+ // and here we can inspect and run the test assertions
	34	+ let myComponent: LinkListBlockComponent = fixture.componentInstance;
	35	+
	36	+ // assure the block object inside the Block matches
	37	+ // the provided through the parent component
	38	+ expect(myComponent.block.type).toEqual("Block");
	39	+ expect(myComponent.owner.name).toEqual("profile-name");
	40	+ done();
	41	+ });
	42	+ });
	43	+
	44	+
	45	+ it("display links stored in block settings", done => {
	46	+
	47	+ @Component({
	48	+ selector: 'test-container-component',
	49	+ template: htmlTemplate,
	50	+ directives: [LinkListBlockComponent],
	51	+ providers: provideFilters("noosferoTemplateFilter")
	52	+ })
	53	+ class CustomBlockType {
	54	+ block: any = { settings: { links: [{ name: 'link1', address: 'address1' }, { name: 'link2', address: 'address2' }] } };
	55	+ owner: any = { name: 'profile-name' };
	56	+ }
	57	+ tcb.createAsync(CustomBlockType).then(fixture => {
	58	+ expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
	59	+ done();
	60	+ });
	61	+ });
	62	+
	63	+ });
	64	+
	65	+});
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+import {Component, Input} from "ng-forward";
	2	+
	3	+@Component({
	4	+ selector: "noosfero-link-list-block",
	5	+ templateUrl: "app/layout/blocks/link-list/link-list-block.html"
	6	+})
	7	+export class LinkListBlockComponent {
	8	+
	9	+ @Input() block: any;
	10	+ @Input() owner: any;
	11	+
	12	+ links: any;
	13	+
	14	+ ngOnInit() {
	15	+ if (this.block && this.block.settings) {
	16	+ this.links = this.block.settings.links;
	17	+ }
	18	+ }
	19	+
	20	+}
@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
	1	+<div class="link-list-block">
	2	+ <div ng-repeat="link in ctrl.links">
	3	+ <a ng-href="{{link.address \| noosferoTemplate:{profile: ctrl.owner.identifier} }}">
	4	+ <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
	5	+ </a>
	6	+ </div>
	7	+</div>
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+.icon-event {
	2	+ @extend .fa-calendar;
	3	+}
	4	+.icon-photos {
	5	+ @extend .fa-photo;
	6	+}
	7	+.icon-edit {
	8	+ @extend .fa-edit;
	9	+}
	10	+.icon-ok {
	11	+ @extend .fa-check;
	12	+}
	13	+.icon-send {
	14	+ @extend .fa-send-o;
	15	+}
	16	+.icon-menu-people {
	17	+ @extend .fa-user;
	18	+}
	19	+.icon-forum {
	20	+ @extend .fa-users;
	21	+}
	22	+.icon-new {
	23	+ @extend .fa-file-o;
	24	+}
	25	+.icon-save {
	26	+ @extend .fa-save;
	27	+}
	28	+
	29	+.link-list-block {
	30	+ a i {
	31	+ line-height: 25px;
	32	+ color: #949494;
	33	+ }
	34	+}
	@@ -1,65 +0,0 @@		@@ -1,65 +0,0 @@
1	-import {TestComponentBuilder} from 'ng-forward/cjs/testing/test-component-builder';
2	-import {Pipe, Input, provide, Component} from 'ng-forward';
3	-import {provideFilters} from '../../../../spec/helpers';
4	-
5	-import {LinkListBlockComponent} from './link-list.component';
6	-
7	-const tcb = new TestComponentBuilder();
8	-
9	-const htmlTemplate: string = '<noosfero-link-list-block [block]="ctrl.block" [owner]="ctrl.owner"></noosfero-link-list-block>';
10	-
11	-
12	-describe("Components", () => {
13	-
14	- describe("Link List Block Component", () => {
15	-
16	- beforeEach(angular.mock.module("templates"));
17	-
18	- it("receives the block and the owner as inputs", done => {
19	-
20	- // Creating a container component (BlockContainerComponent) to include
21	- // the component under test (Block)
22	- @Component({ selector: 'test-container-component', template: htmlTemplate, directives: [LinkListBlockComponent] })
23	- class BlockContainerComponent {
24	- block = { type: 'Block' };
25	- owner = { name: 'profile-name' };
26	- constructor() {
27	- }
28	- }
29	-
30	- // uses the TestComponentBuilder instance to initialize the component
31	- // .overrideView(LinkListBlock, { template: 'asdasdasd', pipes: [NoosferoTemplate] })
32	- tcb.createAsync(BlockContainerComponent).then(fixture => {
33	- // and here we can inspect and run the test assertions
34	- let myComponent: LinkListBlockComponent = fixture.componentInstance;
35	-
36	- // assure the block object inside the Block matches
37	- // the provided through the parent component
38	- expect(myComponent.block.type).toEqual("Block");
39	- expect(myComponent.owner.name).toEqual("profile-name");
40	- done();
41	- });
42	- });
43	-
44	-
45	- it("display links stored in block settings", done => {
46	-
47	- @Component({
48	- selector: 'test-container-component',
49	- template: htmlTemplate,
50	- directives: [LinkListBlockComponent],
51	- providers: provideFilters("noosferoTemplateFilter")
52	- })
53	- class CustomBlockType {
54	- block: any = { settings: { links: [{ name: 'link1', address: 'address1' }, { name: 'link2', address: 'address2' }] } };
55	- owner: any = { name: 'profile-name' };
56	- }
57	- tcb.createAsync(CustomBlockType).then(fixture => {
58	- expect(fixture.debugElement.queryAll(".link-list-block a").length).toEqual(2);
59	- done();
60	- });
61	- });
62	-
63	- });
64	-
65	-});
66	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,20 +0,0 @@	@@ -1,20 +0,0 @@
1	-import {Component, Input} from "ng-forward";
2	-
3	-@Component({
4	- selector: "noosfero-link-list-block",
5	- templateUrl: "app/layout/blocks/link-list/link-list.html"
6	-})
7	-export class LinkListBlockComponent {
8	-
9	- @Input() block: any;
10	- @Input() owner: any;
11	-
12	- links: any;
13	-
14	- ngOnInit() {
15	- if (this.block && this.block.settings) {
16	- this.links = this.block.settings.links;
17	- }
18	- }
19	-
20	-}
	@@ -1,7 +0,0 @@	@@ -1,7 +0,0 @@
1	-<div class="link-list-block">
2	- <div ng-repeat="link in ctrl.links">
3	- <a ng-href="{{link.address \| noosferoTemplate:{profile: ctrl.owner.identifier} }}">
4	- <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
5	- </a>
6	- </div>
7	-</div>
	@@ -1,34 +0,0 @@	@@ -1,34 +0,0 @@
1	-.icon-event {
2	- @extend .fa-calendar;
3	-}
4	-.icon-photos {
5	- @extend .fa-photo;
6	-}
7	-.icon-edit {
8	- @extend .fa-edit;
9	-}
10	-.icon-ok {
11	- @extend .fa-check;
12	-}
13	-.icon-send {
14	- @extend .fa-send-o;
15	-}
16	-.icon-menu-people {
17	- @extend .fa-user;
18	-}
19	-.icon-forum {
20	- @extend .fa-users;
21	-}
22	-.icon-new {
23	- @extend .fa-file-o;
24	-}
25	-.icon-save {
26	- @extend .fa-save;
27	-}
28	-
29	-.link-list-block {
30	- a i {
31	- line-height: 25px;
32	- color: #949494;
33	- }
34	-}
	@@ -10,7 +10,7 @@ import {BlockComponent} from "../layout/blocks/block.component";		@@ -10,7 +10,7 @@ import {BlockComponent} from "../layout/blocks/block.component";
10	import {EnvironmentComponent} from "../environment/environment.component";	10	import {EnvironmentComponent} from "../environment/environment.component";
11	import {EnvironmentHomeComponent} from "../environment/environment-home.component";	11	import {EnvironmentHomeComponent} from "../environment/environment-home.component";
12	import {PeopleBlockComponent} from "../layout/blocks/people-block/people-block.component";	12	import {PeopleBlockComponent} from "../layout/blocks/people-block/people-block.component";
13	-import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list.component";	13	+import {LinkListBlockComponent} from "./../layout/blocks/link-list/link-list-block.component";
14	import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";	14	import {RecentDocumentsBlockComponent} from "../layout/blocks/recent-documents/recent-documents.component";
15	import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";	15	import {ProfileImageBlockComponent} from "../layout/blocks/profile-image-block/profile-image-block.component";
16	import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html.component";	16	import {RawHTMLBlockComponent} from "../layout/blocks/raw-html/raw-html.component";