pasindu
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1025 from menakaj/application-mgt

Browse Source 
Publisher UI modifications.
feature/appm-store/pbac
sinthuja 7 years ago committed by GitHub
parent 9eb25444a7 0e0f6b9ff6
commit 7e15b40860
7 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/App.jsx
Unescape View File

@ -78,7 +78,7 @@ class Base extends Component {
<Route exact path={"/assets/platforms"} component={PlatformListing}/> <Route exact path={"/assets/platforms"} component={PlatformListing}/>
<Route exact path={"/assets/platforms/create"} component={PlatformCreate}/> <Route exact path={"/assets/platforms/create"} component={PlatformCreate}/>
{/*<Route exact path={"/assets/apps/:app"}/>*/} {/*<Route exact path={"/assets/apps/:app"}/>*/}
<Route exact path={"/assets/apps/edit/:app"} component={ApplicationEdit}/> <Route exact path={"/assets/apps/:app/edit"} component={ApplicationEdit}/>
<Route exact path={"/assets/platforms/:platform"}/> <Route exact path={"/assets/platforms/:platform"}/>
<Route exact path={"/assets/platforms/:platform/edit"}/> <Route exact path={"/assets/platforms/:platform/edit"}/>
<Route exact path={"/assets/reviews"}/> <Route exact path={"/assets/reviews"}/>

13
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/api/applicationMgtApi.js
Unescape View File

@ -61,8 +61,12 @@ export default class ApplicationMgtApi {
/** /**
* Method to handle application release process. * Method to handle application release process.
* */ * */
static releaseApplication(appId) { static releaseApplication(appId, applicationRelease, file) {
let release = new FormData();
release.append('applicationRelease', applicationRelease);
release.append('binaryFile', file);
const headers = AuthHandler.createAuthenticationHeaders("multipart/form-data");
return Axios.post(Constants.appManagerEndpoints.APP_RELEASE + appId, release, {headers: headers});
} }
/** /**
@ -73,7 +77,8 @@ export default class ApplicationMgtApi {
* URL Pattern : /application/1.0/ * URL Pattern : /application/1.0/
* */ * */
static updateLifeCycleState(appId, nextState) { static updateLifeCycleState(appId, nextState) {
const headers = AuthHandler.createAuthenticationHeaders("application/json");
return Axios.put(Constants.appManagerEndpoints.GET_ALL_APPS + appId + "/lifecycle?state=" + nextState, {headers: headers});
} }
/** /**
@ -81,6 +86,8 @@ export default class ApplicationMgtApi {
* @param appId: The application uuid. * @param appId: The application uuid.
*/ */
static getNextLifeCycleState(appId) { static getNextLifeCycleState(appId) {
const headers = AuthHandler.createAuthenticationHeaders("application/json");
return Axios.get(Constants.appManagerEndpoints.GET_ALL_APPS + appId + "/lifecycle", {headers: headers});
} }

23
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/common/constants.js
Unescape View File

@ -32,20 +32,29 @@ class Constants {
} }
load() { load() {
let applicationApiContext = '/api/application-mgt/v1.0/applications/1.0.0/';
let platformApiContext = '/api/application-mgt/v1.0/platforms/1.0.0';
let apiBaseUrl = 'https://' + Configuration.serverConfig.hostname + ':' + Configuration.serverConfig.apiPort; let apiBaseUrl = 'https://' + Configuration.serverConfig.hostname + ':' + Configuration.serverConfig.apiPort;
let httpBaseUrl = 'https://' + Configuration.serverConfig.hostname + ':' + Configuration.serverConfig.httpsPort; let httpBaseUrl = 'https://' + Configuration.serverConfig.hostname + ':' + Configuration.serverConfig.httpsPort;
this.appManagerEndpoints = { this.appManagerEndpoints = {
GET_ALL_APPS: apiBaseUrl + '/api/application-mgt/v1.0/applications/1.0.0/', GET_ALL_APPS: apiBaseUrl + applicationApiContext,
CREATE_APP: apiBaseUrl + '/api/application-mgt/v1.0/applications/1.0.0/', CREATE_APP: apiBaseUrl + applicationApiContext,
UPLOAD_IMAGE_ARTIFACTS: apiBaseUrl + '/api/application-mgt/v1.0/applications/1.0.0/upload-image-artifacts/', //+appId UPLOAD_IMAGE_ARTIFACTS: apiBaseUrl + applicationApiContext + 'upload-image-artifacts/', //+appId
GET_IMAGE_ARTIFACTS: apiBaseUrl + '/api/application-mgt/v1.0/applications/1.0.0/image-artifacts/' GET_IMAGE_ARTIFACTS: apiBaseUrl + applicationApiContext + 'image-artifacts/',
APP_RELEASE: apiBaseUrl + applicationApiContext + "release/", //+uuid
GET_APP_RELEASE_ARTIFACTS: apiBaseUrl + applicationApiContext + "/release-artifacts/", //+AppId/version
GET_NEXT_LIFECYCLE_STATE: apiBaseUrl + applicationApiContext //+ [uuid]/lifecycle
}; };
this.platformManagerEndpoints = { this.platformManagerEndpoints = {
CREATE_PLATFORM: apiBaseUrl + '/api/application-mgt/v1.0/platforms/1.0.0', CREATE_PLATFORM: apiBaseUrl + platformApiContext,
GET_ENABLED_PLATFORMS: apiBaseUrl + '/api/application-mgt/v1.0/platforms/1.0.0?status=ENABLED', GET_ENABLED_PLATFORMS: apiBaseUrl + platformApiContext + '?status=ENABLED',
GET_PLATFORM: apiBaseUrl + '/api/application-mgt/v1.0/platforms/1.0.0/' GET_PLATFORM: apiBaseUrl + platformApiContext, //+platformId
GET_PLATFORMS: apiBaseUrl + platformApiContext,
UPDATE_STATUS: apiBaseUrl + platformApiContext + "update-status/", // + platformId + ?status=
EDIT_PLATFORM: apiBaseUrl + platformApiContext //+platformId
}; };
this.userConstants = { this.userConstants = {

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/ApplicationListing.jsx
Unescape View File

@ -194,7 +194,7 @@ class ApplicationListing extends Component {
} }
onAppEditClick(uuid) { onAppEditClick(uuid) {
this.props.history.push("apps/edit/" + uuid); this.props.history.push("apps/" + uuid + "/edit");
} }
closeDrawer() { closeDrawer() {

2
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Application/Create/CreateSteps/Step1.jsx
Unescape View File

@ -254,7 +254,7 @@ class Step1 extends Component {
</FormGroup> </FormGroup>
<FormGroup> <FormGroup>
<Label for="app-short-description"> <Label for="app-short-description">
<FormattedMessage id="shortDescription" defaultMessage="shortDescription"/>* <FormattedMessage id="ShortDescription" defaultMessage="ShortDescription"/>*
</Label> </Label>
<Input <Input
required required

13
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/src/components/Platform/Platform.jsx
Unescape View File

@ -58,11 +58,14 @@ class Platform extends Component {
</Row> </Row>
<Row> <Row>
<div className="platform-content-footer"> <div className="platform-content-footer">
<Button className="custom-flat grey">{platform.enabled ? {platform.enabled ?
<FormattedMessage id="Disable" defaultMessage="Disable"/> : <Button className="custom-flat danger-flat">
<FormattedMessage id="Activate" defaultMessage="Activate"/>} <FormattedMessage id="Disable" defaultMessage="Disable"/>
</Button> </Button> :
<Button className="custom-flat grey"> <Button className="custom-flat primary-flat">
<FormattedMessage id="Activate" defaultMessage="Activate"/>
</Button>}
<Button className="custom-flat primary-flat">
<FormattedMessage id="Share.With.Tenants" defaultMessage="Share.With.Tenants"/> <FormattedMessage id="Share.With.Tenants" defaultMessage="Share.With.Tenants"/>
</Button> </Button>
<Button className="custom-flat grey circle-button" onClick={this.unFold}> <Button className="custom-flat grey circle-button" onClick={this.unFold}>

1
components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/src/main/resources/publisher/webpack.config.js
Unescape View File

@ -16,7 +16,6 @@
* under the License. * under the License.
*/ */
var path = require('path'); var path = require('path');
import '!!style-loader!css-loader!src/css/font-wso2.css';
const config = { const config = {
entry: { entry: {

Write Preview
Loading…
Cancel
Save