Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
catalog.genesys-pgr.org
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
2
Merge Requests
2
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Genesys PGR
Genesys Catalog
catalog.genesys-pgr.org
Commits
366f0c11
Commit
366f0c11
authored
Oct 30, 2018
by
Maxym Borodenko
Committed by
Matija Obreza
Oct 31, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Unnecessary API calls
parent
1e270aec
Pipeline
#7444
passed with stages
in 9 minutes and 43 seconds
Changes
9
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
21 additions
and
19 deletions
+21
-19
src/actions/login.ts
src/actions/login.ts
+2
-0
src/actions/userProfile.ts
src/actions/userProfile.ts
+1
-1
src/datasets/ui/BrowsePage.tsx
src/datasets/ui/BrowsePage.tsx
+1
-1
src/datasets/ui/dataset-stepper/steps/basic-info/index.tsx
src/datasets/ui/dataset-stepper/steps/basic-info/index.tsx
+4
-1
src/descriptorlists/ui/BrowsePage.tsx
src/descriptorlists/ui/BrowsePage.tsx
+1
-1
src/descriptorlists/ui/DisplayPage.tsx
src/descriptorlists/ui/DisplayPage.tsx
+2
-2
src/descriptorlists/ui/descriptorlist-stepper/index.tsx
src/descriptorlists/ui/descriptorlist-stepper/index.tsx
+1
-10
src/partners/ui/BrowsePage.tsx
src/partners/ui/BrowsePage.tsx
+1
-1
src/ui/pages/profile/ProfilePage.tsx
src/ui/pages/profile/ProfilePage.tsx
+8
-2
No files found.
src/actions/login.ts
View file @
366f0c11
...
...
@@ -5,6 +5,7 @@ import { clearCookies, saveCookies } from 'utilities';
import
{
ROLE_CLIENT
}
from
'
constants/userRoles
'
;
import
{
log
}
from
'
utilities/debug
'
;
import
{
configureBackendApi
}
from
'
utilities/requestUtils
'
;
import
{
receiveUserProfile
}
from
'
./userProfile
'
;
export
function
checkAccessTokens
(
dispatch
)
{
const
cookieToken
:
string
=
typeof
window
!==
'
undefined
'
&&
cookies
.
get
(
'
access_token
'
);
...
...
@@ -123,6 +124,7 @@ export const logoutRequest = () => (dispatch, getState) => {
return
LoginService
.
logout
(
token
)
.
then
(()
=>
{
clearCookies
();
dispatch
(
receiveUserProfile
(
null
));
return
dispatch
(
logout
());
});
};
src/actions/userProfile.ts
View file @
366f0c11
...
...
@@ -7,7 +7,7 @@ import { RECEIVE_USER_PROFILE } from 'constants/userProfile';
import
User
from
'
model/user/User
'
;
import
{
IReducerAction
}
from
'
model/common.model
'
;
const
receiveUserProfile
=
(
user
:
User
):
IReducerAction
=>
({
export
const
receiveUserProfile
=
(
user
:
User
):
IReducerAction
=>
({
type
:
RECEIVE_USER_PROFILE
,
payload
:
user
,
});
...
...
src/datasets/ui/BrowsePage.tsx
View file @
366f0c11
...
...
@@ -161,7 +161,7 @@ const mapStateToProps = (state, ownProps) => ({
sort
:
parse
(
ownProps
.
location
.
search
).
s
,
// page sorts
dir
:
parse
(
ownProps
.
location
.
search
).
d
,
// page sort directions
filter
:
state
.
filterCode
.
filters
&&
parse
(
ownProps
.
location
.
search
).
filter
&&
state
.
filterCode
.
filters
[
parse
(
ownProps
.
location
.
search
).
filter
]
||
null
,
filterCode
:
parse
(
ownProps
.
location
.
search
).
filter
,
filterCode
:
parse
(
ownProps
.
location
.
search
).
filter
||
''
,
}),
paged
:
state
.
datasets
.
public
.
paged
,
});
...
...
src/datasets/ui/dataset-stepper/steps/basic-info/index.tsx
View file @
366f0c11
...
...
@@ -33,7 +33,9 @@ interface IDatasetProps extends React.ClassAttributes<any> {
class
BasicInfoStep
extends
React
.
Component
<
IDatasetProps
,
any
>
{
protected
static
needs
=
[];
protected
static
needs
=
[
()
=>
loadMyPartners
(),
];
public
componentWillMount
()
{
const
{
myPartners
,
loadMyPartners
}
=
this
.
props
;
...
...
@@ -68,6 +70,7 @@ class BasicInfoStep extends React.Component<IDatasetProps, any> {
const
mapStateToProps
=
(
state
,
ownProps
)
=>
({
dataset
:
state
.
datasets
.
dashboard
.
dataset
,
myPartners
:
state
.
partner
.
dashboard
.
myPartners
,
stillLoading
:
ownProps
.
stillLoading
,
location
:
ownProps
.
location
,
onDelete
:
ownProps
.
onDelete
,
...
...
src/descriptorlists/ui/BrowsePage.tsx
View file @
366f0c11
...
...
@@ -168,7 +168,7 @@ const mapStateToProps = (state, ownProps) => ({
sort
:
parse
(
ownProps
.
location
.
search
).
s
,
// page sorts
dir
:
parse
(
ownProps
.
location
.
search
).
d
,
// page sort directions
filter
:
state
.
filterCode
.
filters
&&
parse
(
ownProps
.
location
.
search
).
filter
&&
state
.
filterCode
.
filters
[
parse
(
ownProps
.
location
.
search
).
filter
]
||
null
,
filterCode
:
parse
(
ownProps
.
location
.
search
).
filter
,
filterCode
:
parse
(
ownProps
.
location
.
search
).
filter
||
''
,
}),
paged
:
state
.
descriptorList
.
public
.
paged
,
loading
:
state
.
descriptorList
.
loading
,
...
...
src/descriptorlists/ui/DisplayPage.tsx
View file @
366f0c11
...
...
@@ -45,9 +45,9 @@ class DescriptorListPage extends React.Component<IDescriptorListPageProps, any>
];
public
componentWillMount
()
{
const
{
uuid
,
load
ing
,
loadD
escriptorList
}
=
this
.
props
;
const
{
uuid
,
load
DescriptorList
,
d
escriptorList
}
=
this
.
props
;
if
(
uuid
&&
(
!
loading
||
loading
.
uuid
!==
uuid
))
{
if
(
uuid
&&
(
!
descriptorList
||
descriptorList
.
uuid
!==
uuid
))
{
loadDescriptorList
(
uuid
);
}
}
...
...
src/descriptorlists/ui/descriptorlist-stepper/index.tsx
View file @
366f0c11
...
...
@@ -13,8 +13,6 @@ import BottomSection from 'ui/common/stepper/BottomSection';
import
DescriptorList
from
'
model/catalog/DescriptorList
'
;
import
renderRoutes
from
'
ui/renderRoutes
'
;
import
{
loadMyPartners
}
from
'
partners/actions/dashboard
'
;
import
Partner
from
'
model/genesys/Partner
'
;
import
steps
from
'
./steps
'
;
import
PageLayout
from
'
ui/layout/PageLayout
'
;
...
...
@@ -30,8 +28,6 @@ interface IDescriptorListProps extends React.ClassAttributes<any> {
navigateTo
:
(
path
:
string
)
=>
void
;
setPageTitle
:
(
title
:
string
)
=>
void
;
loadMyPartners
:
any
;
myPartners
:
Partner
[];
publishDescriptorList
:
(
descriptorList
:
DescriptorList
,
showDescriptorList
:
boolean
)
=>
void
;
deleteDescriptorList
:
(
descriptorList
:
DescriptorList
)
=>
Promise
<
DescriptorList
>
;
}
...
...
@@ -52,11 +48,7 @@ class DescriptorListStepper extends React.Component<IDescriptorListProps, any> {
}
public
componentWillMount
()
{
const
{
uuid
,
descriptorList
,
loadDescriptorList
,
myPartners
,
loadMyPartners
}
=
this
.
props
;
if
(
!
myPartners
)
{
loadMyPartners
();
}
const
{
uuid
,
descriptorList
,
loadDescriptorList
}
=
this
.
props
;
if
(
uuid
&&
!
descriptorList
)
{
loadDescriptorList
(
uuid
);
...
...
@@ -128,7 +120,6 @@ const mapStateToProps = (state, ownProps) => ({
const
mapDispatchToProps
=
(
dispatch
)
=>
bindActionCreators
({
loadDescriptorList
,
deleteDescriptorList
,
loadMyPartners
,
publishDescriptorList
,
setPageTitle
,
navigateTo
,
...
...
src/partners/ui/BrowsePage.tsx
View file @
366f0c11
...
...
@@ -164,7 +164,7 @@ const mapStateToProps = (state, ownProps) => ({
sort
:
parse
(
ownProps
.
location
.
search
).
s
,
// page sorts
dir
:
parse
(
ownProps
.
location
.
search
).
d
,
// page sort directions
filter
:
state
.
filterCode
.
filters
&&
parse
(
ownProps
.
location
.
search
).
filter
&&
state
.
filterCode
.
filters
[
parse
(
ownProps
.
location
.
search
).
filter
]
||
null
,
filterCode
:
parse
(
ownProps
.
location
.
search
).
filter
,
filterCode
:
parse
(
ownProps
.
location
.
search
).
filter
||
''
,
}),
paged
:
state
.
partner
.
public
.
paged
,
loading
:
state
.
partner
.
public
.
loading
,
...
...
src/ui/pages/profile/ProfilePage.tsx
View file @
366f0c11
...
...
@@ -21,13 +21,19 @@ interface IProfilePageProps extends React.ClassAttributes<any> {
class
ProfilePage
extends
React
.
Component
<
IProfilePageProps
,
any
>
{
protected
static
needs
=
[
()
=>
loadUserProfile
(),
];
constructor
(
props
)
{
super
(
props
);
}
public
componentWillMount
()
{
const
{
loadUserProfile
}
=
this
.
props
;
loadUserProfile
();
const
{
loadUserProfile
,
userProfile
}
=
this
.
props
;
if
(
!
userProfile
)
{
loadUserProfile
();
}
}
private
onChangePassword
=
(
values
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
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 comment