From 5bd128adb61453757762d0e6e8ba7ac78298ed6f Mon Sep 17 00:00:00 2001 From: Daniel Karnutsch Date: Tue, 7 Jan 2025 17:49:41 +0100 Subject: [PATCH] Demo: Remove builder --- demo/admin/src/common/MasterHeader.tsx | 3 +- demo/admin/src/common/MasterMenu.tsx | 10 ---- demo/admin/src/dashboard/DashboardPage.tsx | 3 +- demo/api/schema.gql | 53 +++------------------- demo/api/src/app.module.ts | 2 - 5 files changed, 9 insertions(+), 62 deletions(-) diff --git a/demo/admin/src/common/MasterHeader.tsx b/demo/admin/src/common/MasterHeader.tsx index 3c714a49f7..8fed72cd15 100644 --- a/demo/admin/src/common/MasterHeader.tsx +++ b/demo/admin/src/common/MasterHeader.tsx @@ -1,10 +1,9 @@ -import { BuildEntry, ContentScopeControls, Header, UserHeaderItem } from "@comet/cms-admin"; +import { ContentScopeControls, Header, UserHeaderItem } from "@comet/cms-admin"; const MasterHeader = () => { return (
-
); diff --git a/demo/admin/src/common/MasterMenu.tsx b/demo/admin/src/common/MasterMenu.tsx index d8a038a590..a51c24070b 100644 --- a/demo/admin/src/common/MasterMenu.tsx +++ b/demo/admin/src/common/MasterMenu.tsx @@ -10,7 +10,6 @@ import { MasterMenu, MasterMenuData, PagesPage, - PublisherPage, UserPermissionsPage, } from "@comet/cms-admin"; import { ImportFromPicsum } from "@src/dam/ImportFromPicsum"; @@ -166,15 +165,6 @@ export const masterMenuData: MasterMenuData = [ primary: , icon: , items: [ - { - type: "route", - primary: , - route: { - path: "/system/publisher", - component: PublisherPage, - }, - requiredPermission: "builds", - }, { type: "route", primary: , diff --git a/demo/admin/src/dashboard/DashboardPage.tsx b/demo/admin/src/dashboard/DashboardPage.tsx index bafc8c5e55..68e62b780a 100644 --- a/demo/admin/src/dashboard/DashboardPage.tsx +++ b/demo/admin/src/dashboard/DashboardPage.tsx @@ -1,5 +1,5 @@ import { MainContent, Stack, Toolbar } from "@comet/admin"; -import { ContentScopeIndicator, DashboardHeader, LatestBuildsDashboardWidget, useUserPermissionCheck } from "@comet/cms-admin"; +import { ContentScopeIndicator, DashboardHeader, useUserPermissionCheck } from "@comet/cms-admin"; import { Grid } from "@mui/material"; import { useIntl } from "react-intl"; @@ -23,7 +23,6 @@ export function DashboardPage() { {isAllowed("pageTree") && } - {import.meta.env.MODE !== "development" && } diff --git a/demo/api/schema.gql b/demo/api/schema.gql index 11eb8d467f..19cfedef6b 100644 --- a/demo/api/schema.gql +++ b/demo/api/schema.gql @@ -117,44 +117,6 @@ enum LicenseType { RIGHTS_MANAGED } -type BuildTemplate { - id: ID! - name: String! - - """ - Human readable label provided by comet-dxp.com/label annotation. Use name as fallback if not present - """ - label: String -} - -type AutoBuildStatus { - hasChangesSinceLastBuild: Boolean! - lastCheck: DateTime - nextCheck: DateTime! -} - -type Build { - id: ID! - status: KubernetesJobStatus! - name: String - - """ - Human readable label provided by comet-dxp.com/label annotation. Use name as fallback if not present - """ - label: String - trigger: String - startTime: DateTime - completionTime: DateTime - estimatedCompletionTime: DateTime -} - -enum KubernetesJobStatus { - pending - active - succeeded - failed -} - type KubernetesCronJob { id: ID! name: String! @@ -181,6 +143,13 @@ type KubernetesJob { completionTime: DateTime } +enum KubernetesJobStatus { + pending + active + succeeded + failed +} + type FilenameResponse { name: String! folderId: ID @@ -763,9 +732,6 @@ type Query { userPermissionsAvailablePermissions: [String!]! userPermissionsContentScopes(userId: String!, skipManual: Boolean): [JSONObject!]! userPermissionsAvailableContentScopes: [JSONObject!]! - buildTemplates: [BuildTemplate!]! - builds(limit: Float): [Build!]! - autoBuildStatus: AutoBuildStatus! link(id: ID!): Link page(id: ID!): Page! pageTreeNode(id: ID!): PageTreeNode @@ -1186,7 +1152,6 @@ type Mutation { userPermissionsDeletePermission(id: ID!): Boolean! userPermissionsUpdateOverrideContentScopes(input: UserPermissionOverrideContentScopesInput!): UserPermission! userPermissionsUpdateContentScopes(userId: String!, input: UserContentScopesInput!): Boolean! - createBuilds(input: CreateBuildsInput!): Boolean! saveLink(id: ID!, input: LinkInput!, lastUpdatedAt: DateTime, attachedPageTreeNodeId: ID): Link! savePage(pageId: ID!, input: PageInput!, lastUpdatedAt: DateTime, attachedPageTreeNodeId: ID): Page! updatePageTreeNode(id: ID!, input: PageTreeNodeUpdateInput!): PageTreeNode! @@ -1260,10 +1225,6 @@ input UserContentScopesInput { contentScopes: [JSONObject!]! = [] } -input CreateBuildsInput { - names: [String!]! -} - input LinkInput { content: LinkBlockInput! } diff --git a/demo/api/src/app.module.ts b/demo/api/src/app.module.ts index 50b93559a0..af2a0f5541 100644 --- a/demo/api/src/app.module.ts +++ b/demo/api/src/app.module.ts @@ -5,7 +5,6 @@ import { BlobStorageModule, BlocksModule, BlocksTransformerMiddlewareFactory, - BuildsModule, ContentGenerationModule, CronJobsModule, DamModule, @@ -111,7 +110,6 @@ export class AppModule { KubernetesModule.register({ helmRelease: config.helmRelease, }), - BuildsModule, LinksModule, PagesModule, PageTreeModule.forRoot({