Migrate noosfero template filter to ngforward

Victor Costa
1 parent 3c4173e9
Showing 5 changed files with 33 additions and 27 deletions Show diff stats
src/app/components/noosfero/noosfero-template.filter.js
src/app/components/noosfero/noosfero-template.filter.spec.ts
src/app/components/noosfero/noosfero-template.filter.ts
src/app/index.ts
src/app/main/main.component.ts
@@ -1,13 +0,0 @@
-(function() {
-  'use strict';
-  angular
-    .module("noosferoApp")
-    .filter("noosferoTemplate", function() {
-      return function(text, options) {
-        for(var option in options) {
-          text = text.replace('{'+option+'}', options[option]);
-        }
-        return text;
-      }
-    })
-})();
@@ -0,0 +1,19 @@
+import {quickCreateComponent} from "../../../spec/helpers";
+import {NoosferoTemplate} from './noosfero-template.filter';
+
+describe("Filters", () => {
+    describe("Noosfero Template Filter", () => {
+
+        beforeEach(angular.mock.module("templates"));
+
+        it("replace the options in text with the values passed on options", done => {
+            let text = 'profile: {profile}, other: {other}';
+            let htmlTemplate = `{{ '${text}' | noosferoTemplate: {profile: 'profile1', other: 'other value'} }}`;
+            quickCreateComponent({ providers: [NoosferoTemplate], template: htmlTemplate }).then(fixture => {
+                expect(fixture.debugElement.text()).toEqual("profile: profile1, other: other value");
+                done();
+            });
+        });
+
+    });
+});
-(function() {
-  'use strict';
-  angular
-    .module("noosferoApp")
-    .filter("noosferoTemplate", function() {
-      return function(text, options) {
-        for(var option in options) {
-          text = text.replace('{'+option+'}', options[option]);
+import {Pipe} from "ng-forward";
+
+@Pipe("noosferoTemplate")
+export class NoosferoTemplate {
+
+    transform(text: string, options: any) {
+        for (var option in options) {
+            text = text.replace('{' + option + '}', options[option]);
         }
         return text;
-      }
-    })
-})();
+    }
+
+}
@@ -42,7 +42,6 @@ NoosferoApp.run(noosferoAngularRunBlock);
 NoosferoApp.addController("AuthController", AuthController);
-require("./components/noosfero/noosfero-template.filter.js");
 require("./components/noosfero/noosfero.service.js");
 require("./components/noosfero/profile-image/profile-image.component.js");
@@ -10,7 +10,7 @@ import {LinkListBlock} from &quot;../components/noosfero-blocks/link-list/link-list.c
 import {RecentDocumentsBlock} from "../components/noosfero-blocks/recent-documents/recent-documents.component";
 import {ProfileImageBlock} from "../components/noosfero-blocks/profile-image/profile-image.component";
 import {MembersBlock} from "../components/noosfero-blocks/members-block/members-block.component";
-
+import {NoosferoTemplate} from "../components/noosfero/noosfero-template.filter";
 import {AuthService} from "./../components/auth/auth_service";
 import {Session} from "./../components/auth/session";
@@ -35,7 +35,8 @@ export class MainContent {
     template: '<div ng-view></div>',
     directives: [
         NoosferoArticleBlog, ArticleView, Boxes, Block, LinkListBlock,
-        MainBlock, RecentDocumentsBlock, Navbar, ProfileImageBlock, MembersBlock
+        MainBlock, RecentDocumentsBlock, Navbar, ProfileImageBlock,
+        MembersBlock, NoosferoTemplate
     ],
     providers: [AuthService, Session]
 })
	@@ -1,13 +0,0 @@	@@ -1,13 +0,0 @@
1	-(function() {
2	- 'use strict';
3	- angular
4	- .module("noosferoApp")
5	- .filter("noosferoTemplate", function() {
6	- return function(text, options) {
7	- for(var option in options) {
8	- text = text.replace('{'+option+'}', options[option]);
9	- }
10	- return text;
11	- }
12	- })
13	-})();
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+import {quickCreateComponent} from "../../../spec/helpers";
	2	+import {NoosferoTemplate} from './noosfero-template.filter';
	3	+
	4	+describe("Filters", () => {
	5	+ describe("Noosfero Template Filter", () => {
	6	+
	7	+ beforeEach(angular.mock.module("templates"));
	8	+
	9	+ it("replace the options in text with the values passed on options", done => {
	10	+ let text = 'profile: {profile}, other: {other}';
	11	+ let htmlTemplate = `{{ '${text}' \| noosferoTemplate: {profile: 'profile1', other: 'other value'} }}`;
	12	+ quickCreateComponent({ providers: [NoosferoTemplate], template: htmlTemplate }).then(fixture => {
	13	+ expect(fixture.debugElement.text()).toEqual("profile: profile1, other: other value");
	14	+ done();
	15	+ });
	16	+ });
	17	+
	18	+ });
	19	+});
	@@ -42,7 +42,6 @@ NoosferoApp.run(noosferoAngularRunBlock);		@@ -42,7 +42,6 @@ NoosferoApp.run(noosferoAngularRunBlock);
42	NoosferoApp.addController("AuthController", AuthController);	42	NoosferoApp.addController("AuthController", AuthController);
43		43
44		44
45	-require("./components/noosfero/noosfero-template.filter.js");
46	require("./components/noosfero/noosfero.service.js");	45	require("./components/noosfero/noosfero.service.js");
47	require("./components/noosfero/profile-image/profile-image.component.js");	46	require("./components/noosfero/profile-image/profile-image.component.js");
48		47