Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -306,3 +306,10 @@ __pycache__/
/dist
/docker
tsconfig.local-npm.json

# OpenAPI generator output files
swagger.json
openapitools.json

# Local static server config (for testing production builds)
serve.json
48 changes: 48 additions & 0 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"docker:stack:identity": "docker stack deploy -c ./docker/docker-compose.yml -c ./docker/compose/identity.yml identity_stack",
"docker:destroy": "docker stack rm player_stack identity_stack",
"swagger:gen": "curl --insecure http://localhost:4300/swagger/v1/swagger.json --output swagger.json && node_modules/@openapitools/openapi-generator-cli/bin/openapi-generator generate -i ./swagger.json -g typescript-angular -o src/app/generated/player-api --additional-properties ngVersion=12.1 --additional-properties useRxJS6=true --additional-properties modelPropertyNaming=original --type-mappings=DateTime=Date --skip-validate-spec",
"swagger:gen-win": "docker run --rm -v %CD%:/local openapitools/openapi-generator-cli:v4.3.0 generate -i http://host.docker.internal:4300/swagger/v1/swagger.json?format=openapi -g typescript-angular -o /local/src/app/generated/player-api --additional-properties ngVersion=12.1 --additional-properties useRxJS6=true --additional-properties modelPropertyNaming=original --type-mappings=DateTime=Date --skip-validate-spec"
"swagger:gen-docker": "cross-env-shell docker run --rm -v $INIT_CWD:/local openapitools/openapi-generator-cli:v7.15.0 generate -i http://host.docker.internal:4300/swagger/v1/swagger.json -g typescript-angular -o /local/src/app/generated/player-api --additional-properties ngVersion=12.1 --additional-properties useRxJS6=true --additional-properties modelPropertyNaming=original --type-mappings=DateTime=Date --skip-validate-spec"
},
"scriptComments": {
"docker:stack": "// Runs the entire player stack",
Expand Down Expand Up @@ -83,6 +83,8 @@
"jasmine-core": "^6.0.1",
"jasmine-spec-reporter": "^7.0.0",
"prettier": "^3.8.1",
"cross-env": "^7.0.3",
"rimraf": "^6.1.2",
"ts-node": "^10.9.2",
"typescript": "^5.9.3"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ export class AdminViewSearchComponent implements OnInit {
this.viewService.getView(viewGuid).subscribe((view) => {
let msg = '';
let title = '';
let activation = ViewStatus.Inactive;
let activation: ViewStatus = ViewStatus.Inactive;
if (
view.status === undefined ||
view.status === ViewStatus.Inactive
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { ApplicationData } from '../../../models/application-data';
import { TeamData } from '../../../models/team-data';
import { ApplicationsService } from '../../../services/applications/applications.service';
import { FocusedAppService } from '../../../services/focused-app/focused-app.service';
import { XApiService } from '../../../services/xapi/xapi.service';

@Component({
selector: 'app-application-list',
Expand All @@ -42,7 +43,8 @@ export class ApplicationListComponent implements OnInit, OnChanges, OnDestroy {
private focusedAppService: FocusedAppService,
private authService: ComnAuthService,
private sanitizer: DomSanitizer,
private authQuery: ComnAuthQuery
private authQuery: ComnAuthQuery,
private xapiService: XApiService
) {}

ngOnInit() {
Expand Down Expand Up @@ -100,6 +102,9 @@ export class ApplicationListComponent implements OnInit, OnChanges, OnDestroy {
window.location.reload();
} else {
this.focusedAppService.focusedAppUrl.next(app.themedUrl);
this.xapiService
.applicationSwitched(this.viewId, app.name, app.url)
.subscribe();
}
});
}
Expand Down
87 changes: 87 additions & 0 deletions src/app/generated/player-api/.openapi-generator/FILES
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
.gitignore
README.md
api.base.service.ts
api.module.ts
api/api.ts
api/application.service.ts
api/file.service.ts
api/health.service.ts
api/permission.service.ts
api/role.service.ts
api/team.service.ts
api/teamMembership.service.ts
api/teamPermission.service.ts
api/teamRole.service.ts
api/user.service.ts
api/view.service.ts
api/viewMembership.service.ts
api/webhook.service.ts
api/xApi.service.ts
configuration.ts
encoder.ts
git_push.sh
index.ts
model/application.ts
model/applicationInstance.ts
model/applicationTemplate.ts
model/archiveType.ts
model/cloneViewCommand.ts
model/createApplicationCommand.ts
model/createApplicationInstanceCommand.ts
model/createApplicationTemplateCommand.ts
model/createPermissionCommand.ts
model/createRoleCommand.ts
model/createTeamCommand.ts
model/createTeamPermissionCommand.ts
model/createTeamRoleCommand.ts
model/createUserCommand.ts
model/createViewCommand.ts
model/createWebhookSubscriptionCommand.ts
model/editApplicationCommand.ts
model/editApplicationInstanceCommand.ts
model/editApplicationTemplateCommand.ts
model/editPermissionCommand.ts
model/editRoleCommand.ts
model/editTeamCommand.ts
model/editTeamMembershipCommand.ts
model/editTeamPermissionCommand.ts
model/editTeamRoleCommand.ts
model/editUserCommand.ts
model/editViewCommand.ts
model/eventType.ts
model/fileModel.ts
model/healthStatus.ts
model/importApplicationTemplatesResult.ts
model/importViewFailure.ts
model/importViewFailureType.ts
model/importViewsResult.ts
model/models.ts
model/notification.ts
model/notificationPriority.ts
model/notificationType.ts
model/permission.ts
model/problemDetails.ts
model/role.ts
model/sendTeamNotificationCommand.ts
model/sendUserNotificationCommand.ts
model/sendViewNotificationCommand.ts
model/systemPermission.ts
model/team.ts
model/teamMembership.ts
model/teamPermission.ts
model/teamPermissionModel.ts
model/teamPermissionsClaim.ts
model/teamRole.ts
model/user.ts
model/view.ts
model/viewCreated.ts
model/viewDeleted.ts
model/viewMembership.ts
model/viewPermission.ts
model/viewStatus.ts
model/webhookEvent.ts
model/webhookSubscription.ts
model/webhookSubscriptionForm.ts
model/webhookSubscriptionPartialEditForm.ts
param.ts
variables.ts
2 changes: 1 addition & 1 deletion src/app/generated/player-api/.openapi-generator/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.3.0
7.15.0
Loading
Loading