Skip to content
This repository has been archived by the owner on Apr 14, 2023. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'origin/development'
Browse files Browse the repository at this point in the history
# Conflicts:
#	bootloader/base-compose.yml
#	walkoff.ps1
  • Loading branch information
hburke123 committed Aug 30, 2019
2 parents 0cdf014 + 8460726 commit cbee06e
Show file tree
Hide file tree
Showing 253 changed files with 13,707 additions and 2,994 deletions.
6 changes: 6 additions & 0 deletions api_gateway/api/objects/global_variables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ GlobalVariable:
type: array
items:
type: object
access_level:
type: integer
nullable: true
creator:
type: integer
description: The User ID of the creator of the global variable
value:
# oneOf:
# - type: "string"
Expand Down
14 changes: 14 additions & 0 deletions api_gateway/api/objects/scheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,17 @@ TaskTrigger:
args:
type: object
description: Arguments for the trigger.

ControlScheduledTask:
type: object
description: Start/Stop of Scheduled Task
required: [action]
properties:
id:
description: Id of scheduled task to perform action on
type: integer
example: date
action:
description: Arguments for the trigger
type: string
enum: [start, stop]
23 changes: 23 additions & 0 deletions api_gateway/api/objects/users.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ AddUser:
active:
description: activate/deactive a user. Active can only be changed by an admin.
type: boolean
resources_created:
type: array

EditUser:
type: object
Expand Down Expand Up @@ -44,6 +46,27 @@ EditUser:
description: A new list of role IDs that this user will possess. Roles can only be assigned by an admin.
$ref: '#/components/schemas/RoleIdList'

EditPersonalUser:
type: object
required: [old_username]
properties:
old_username:
description: Old username of the user
type: string
example: administrator1
new_username:
description: New username of the user
type: string
example: administrator2
old_password:
description: Previous password for the user
type: string
example: password123
password:
description: New password for the user
type: string
example: password321

DisplayUser:
type: object
properties:
Expand Down
6 changes: 6 additions & 0 deletions api_gateway/api/objects/workflows.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ WorkflowJSON:
nullable: true
items:
type: object
access_level:
type: integer
nullable: true
creator:
type: integer
description: The User ID of the creator of the global variable


WorkflowMetaData:
Expand Down
26 changes: 26 additions & 0 deletions api_gateway/api/scheduler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,29 @@
application/json:
schema:
$ref: '#/components/schemas/Error'
patch:
tags:
- Scheduler
summary: Stop a scheduled task
operationId: api_gateway.server.endpoints.scheduler.control_scheduled_task
requestBody:
required: true
content:
application/json:
schema:
$ref: '#/components/schemas/ControlScheduledTask'
responses:
204:
description: Success
404:
description: Scheduled task does not exist
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
400:
description: Invalid input error
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
84 changes: 84 additions & 0 deletions api_gateway/api/users.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,3 +125,87 @@
application/json:
schema:
$ref: '#/components/schemas/Error'

/users/permissions:
get:
tags:
- Users
summary: Get a user's permissions JSON
description: ''
operationId: api_gateway.server.endpoints.users.list_permissions
responses:
200:
description: Success
content:
application/json:
schema:
description: The user object matching the user id inputted
$ref: '#/components/schemas/DisplayUser'
404:
description: Could not display user <username>. User does not exist.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'

/users/personal_data/{username}:
parameters:
- name: username
in: path
description: The username of the user to be fetched
required: true
schema:
type: string
get:
tags:
- Users
summary: Get personal user data
description: ''
operationId: api_gateway.server.endpoints.users.read_personal_user
responses:
200:
description: Success
content:
application/json:
schema:
description: The user object matching the username inputted
$ref: '#/components/schemas/DisplayUser'
404:
description: Could not display user <username>. User does not exist.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
put:
tags:
- Users
summary: Update personal user data
description: ''
operationId: api_gateway.server.endpoints.users.update_personal_user
requestBody:
description: Updated fields for the user object
required: true
content:
application/json:
schema:
$ref: '#/components/schemas/EditPersonalUser'
responses:
200:
description: Success
content:
application/json:
schema:
description: The updated user.
$ref: '#/components/schemas/DisplayUser'
400:
description: Invalid password
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
404:
description: Could not edit user <username>. User does not exist.
content:
application/json:
schema:
$ref: '#/components/schemas/Error'
4 changes: 2 additions & 2 deletions api_gateway/client/dist/walkoff/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
<link rel="shortcut icon" href="client/dist/walkoff/favicon.ico" type="image/x-icon">
<link rel="icon" href="client/dist/walkoff/favicon.ico" type="image/x-icon">
<link rel="stylesheet" href="client/dist/walkoff/styles.a7145bf960e458a8099b.css"></head>
<link rel="stylesheet" href="client/dist/walkoff/styles.75e9067f07f100f4a70e.css"></head>
<body>
<main-component>Loading...</main-component>
<script src="client/dist/walkoff/runtime.5978eebdd8411421365f.js"></script><script src="client/dist/walkoff/polyfills-es5.38ed56f75e7d87c23835.js" nomodule></script><script src="client/dist/walkoff/polyfills.425a354b82ebc224c491.js"></script><script src="client/dist/walkoff/scripts.dad7fdaf9a0a03a091ee.js"></script><script src="client/dist/walkoff/main.ed6e481dffde331533b4.js"></script></body>
<script src="client/dist/walkoff/runtime.5978eebdd8411421365f.js"></script><script src="client/dist/walkoff/polyfills-es5.38ed56f75e7d87c23835.js" nomodule></script><script src="client/dist/walkoff/polyfills.425a354b82ebc224c491.js"></script><script src="client/dist/walkoff/scripts.dad7fdaf9a0a03a091ee.js"></script><script src="client/dist/walkoff/main.150108dc07cd4127271b.js"></script></body>
</html>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

53 changes: 8 additions & 45 deletions api_gateway/client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions api_gateway/client/src/app/apps/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export class AppService {
return this.http.get('api/apps/apis')
.toPromise()
.then((data: any[]) => plainToClass(AppApi, data))
.then((appApis: AppApi[]) => appApis.filter(a => a.name !== 'Builtin'))
.then((appApis: AppApi[]) => {
appApis.forEach(app => app.action_apis.map(action => {
action.app_name = app.name;
Expand Down
12 changes: 0 additions & 12 deletions api_gateway/client/src/app/apps/apps.list.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,6 @@
}
}

#playbookBreadcrumbs {
background-color: unset;
margin-block-end: unset;
padding-inline-start: unset;
font-weight: bold;
font-size: 1.5rem;

a {
text-decoration: none;
}
}

.workflow-card {
height: 100%;
max-height: 300px;
Expand Down
Loading

0 comments on commit cbee06e

Please sign in to comment.