Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Demo: Remove builder #3045

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
3 changes: 1 addition & 2 deletions demo/admin/src/common/MasterHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { BuildEntry, ContentScopeControls, Header, UserHeaderItem } from "@comet/cms-admin";
import { ContentScopeControls, Header, UserHeaderItem } from "@comet/cms-admin";

const MasterHeader = () => {
return (
<Header>
<ContentScopeControls />
<BuildEntry />
<UserHeaderItem />
</Header>
);
Expand Down
10 changes: 0 additions & 10 deletions demo/admin/src/common/MasterMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
MasterMenu,
MasterMenuData,
PagesPage,
PublisherPage,
UserPermissionsPage,
} from "@comet/cms-admin";
import { ImportFromPicsum } from "@src/dam/ImportFromPicsum";
Expand Down Expand Up @@ -166,15 +165,6 @@ export const masterMenuData: MasterMenuData = [
primary: <FormattedMessage id="menu.system" defaultMessage="System" />,
icon: <Wrench />,
items: [
{
type: "route",
primary: <FormattedMessage id="menu.publisher" defaultMessage="Publisher" />,
route: {
path: "/system/publisher",
component: PublisherPage,
},
requiredPermission: "builds",
},
{
type: "route",
primary: <FormattedMessage id="menu.cronJobs" defaultMessage="Cron Jobs" />,
Expand Down
3 changes: 1 addition & 2 deletions demo/admin/src/dashboard/DashboardPage.tsx
Original file line number Diff line number Diff line change
@@ -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";

Expand All @@ -23,7 +23,6 @@ export function DashboardPage() {
<MainContent>
<Grid container direction="row" spacing={4}>
{isAllowed("pageTree") && <LatestContentUpdates />}
{import.meta.env.MODE !== "development" && <LatestBuildsDashboardWidget />}
</Grid>
</MainContent>
</Stack>
Expand Down
53 changes: 7 additions & 46 deletions demo/api/schema.gql
Original file line number Diff line number Diff line change
Expand Up @@ -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!
Expand All @@ -181,6 +143,13 @@ type KubernetesJob {
completionTime: DateTime
}

enum KubernetesJobStatus {
pending
active
succeeded
failed
}

type FilenameResponse {
name: String!
folderId: ID
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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!
Expand Down Expand Up @@ -1260,10 +1225,6 @@ input UserContentScopesInput {
contentScopes: [JSONObject!]! = []
}

input CreateBuildsInput {
names: [String!]!
}

input LinkInput {
content: LinkBlockInput!
}
Expand Down
2 changes: 0 additions & 2 deletions demo/api/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import {
BlobStorageModule,
BlocksModule,
BlocksTransformerMiddlewareFactory,
BuildsModule,
ContentGenerationModule,
CronJobsModule,
DamModule,
Expand Down Expand Up @@ -111,7 +110,6 @@ export class AppModule {
KubernetesModule.register({
helmRelease: config.helmRelease,
}),
BuildsModule,
LinksModule,
PagesModule,
PageTreeModule.forRoot({
Expand Down
Loading