Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit e0fd9f99
authored
Aug 04, 2018
by
Aino Leppänen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lint errors fixed
1 parent
198eef70
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
code/moya-angular/package.json
code/moya-angular/src/app/components/moya-locale/locale.service.ts
code/moya-angular/src/app/modules/viplist/viplist.service.ts
code/moya-angular/src/app/shared/services/cache.service.ts
code/moya-angular/package.json
View file @
e0fd9f9
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
"angular-cli"
:
{},
"angular-cli"
:
{},
"scripts"
:
{
"scripts"
:
{
"ng"
:
"ng"
,
"ng"
:
"ng"
,
"start"
:
"ng serve --proxy-config=moyaproxy.conf.json --base-href=/"
,
"start"
:
"ng serve --proxy-config=moyaproxy.conf.json --base-href=/
&& ng lint
"
,
"build"
:
"ng build"
,
"build"
:
"ng build"
,
"aot"
:
"ng build --aot"
,
"aot"
:
"ng build --aot"
,
"test"
:
"ng test"
,
"test"
:
"ng test"
,
...
...
code/moya-angular/src/app/components/moya-locale/locale.service.ts
View file @
e0fd9f9
...
@@ -91,7 +91,7 @@ export class LocaleService {
...
@@ -91,7 +91,7 @@ export class LocaleService {
}
}
return
this
.
selectLocale
(
DEFAULT_LOCALE
);
return
this
.
selectLocale
(
DEFAULT_LOCALE
);
}),);
}),
);
}
}
...
...
code/moya-angular/src/app/modules/viplist/viplist.service.ts
View file @
e0fd9f9
...
@@ -29,11 +29,11 @@ export class ViplistService {
...
@@ -29,11 +29,11 @@ export class ViplistService {
if
(
!
searchString
)
{
if
(
!
searchString
)
{
return
this
.
http
.
get
(
MOYA_BASE_URL
+
'v3/vip/all'
).
pipe
(
return
this
.
http
.
get
(
MOYA_BASE_URL
+
'v3/vip/all'
).
pipe
(
switchMap
(
res
=>
observableForkJoin
(...(
res
as
Array
<
any
>
)
.
map
(
apiRow
=>
this
.
hostPopulator
(
apiRow
)))));
switchMap
(
res
=>
observableForkJoin
(...(
res
as
Array
<
any
>
)
,
map
(
apiRow
=>
this
.
hostPopulator
(
apiRow
)))));
}
}
return
this
.
http
.
get
(
MOYA_BASE_URL
+
'v3/vip/search/'
+
searchString
).
pipe
(
return
this
.
http
.
get
(
MOYA_BASE_URL
+
'v3/vip/search/'
+
searchString
).
pipe
(
switchMap
(
v
=>
observableForkJoin
(...(
v
as
Array
<
any
>
)
.
map
(
x
=>
this
.
hostPopulator
(
x
)))));
switchMap
(
v
=>
observableForkJoin
(...(
v
as
Array
<
any
>
)
,
map
(
x
=>
this
.
hostPopulator
(
x
)))));
}
}
...
@@ -70,7 +70,7 @@ export class ViplistService {
...
@@ -70,7 +70,7 @@ export class ViplistService {
private
hostPopulator
(
rawVip
:
any
):
Observable
<
Vip
>
{
private
hostPopulator
(
rawVip
:
any
):
Observable
<
Vip
>
{
return
this
.
userService
.
get
(
rawVip
.
hostId
).
pipe
(
return
this
.
userService
.
get
(
rawVip
.
hostId
).
pipe
(
map
((
u
:
User
)
=>
{
rawVip
.
host
=
u
;
return
<
Vip
>
rawVip
;
}),
map
(
x
=>
x
as
Vip
),
);
map
((
u
:
User
)
=>
{
rawVip
.
host
=
u
;
return
<
Vip
>
rawVip
;
}),
map
(
x
=>
x
as
Vip
),
);
}
}
...
...
code/moya-angular/src/app/shared/services/cache.service.ts
View file @
e0fd9f9
...
@@ -87,7 +87,7 @@ export class CacheService {
...
@@ -87,7 +87,7 @@ export class CacheService {
const
hotSource
=
source
.
pipe
(
const
hotSource
=
source
.
pipe
(
tap
(
val
=>
this
.
cache
.
set
(
cacheName
,
new
CachedItem
(
moduleName
,
cachePath
,
val
))),
tap
(
val
=>
this
.
cache
.
set
(
cacheName
,
new
CachedItem
(
moduleName
,
cachePath
,
val
))),
publishLast
(),
refCount
(),
);
publishLast
(),
refCount
(),
);
this
.
cache
.
set
(
cacheName
,
new
CachedItem
(
moduleName
,
cachePath
,
hotSource
,
true
));
this
.
cache
.
set
(
cacheName
,
new
CachedItem
(
moduleName
,
cachePath
,
hotSource
,
true
));
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment