Skip to content
Merged
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
8 changes: 4 additions & 4 deletions packages/all/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"clean": "rm -rf .objectstack/marketplace-packages dist"
},
"dependencies": {
"@objectstack/account": "^11.2.0",
"@objectstack/cli": "^11.2.0",
"@objectstack/driver-sqlite-wasm": "^11.2.0",
"@objectstack/runtime": "^11.2.0",
"@objectstack/account": "^15.1.1",
"@objectstack/cli": "^15.1.1",
"@objectstack/driver-sqlite-wasm": "^15.1.1",
"@objectstack/runtime": "^15.1.1",
"sql.js": "^1.14.1"
},
"optionalDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions packages/compliance/objectstack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,9 @@ export default defineStack({
translations: [ComplianceTranslations],

sharingRules: [],
roles: RoleHierarchy.roles.map((r) => ({
positions: RoleHierarchy.roles.map((r) => ({
name: r.name,
label: r.label,
parent: r.parentRole ?? undefined,
})),

data: ComplianceSeedData,
Expand Down
22 changes: 11 additions & 11 deletions packages/compliance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"test": "objectstack build"
},
"dependencies": {
"@objectstack/account": "^11.2.0",
"@objectstack/cli": "^11.2.0",
"@objectstack/driver-memory": "^11.2.0",
"@objectstack/driver-sql": "^11.2.0",
"@objectstack/driver-sqlite-wasm": "^11.2.0",
"@objectstack/metadata": "^11.2.0",
"@objectstack/objectql": "^11.2.0",
"@objectstack/runtime": "^11.2.0",
"@objectstack/service-analytics": "^11.2.0",
"@objectstack/service-automation": "^11.2.0",
"@objectstack/spec": "^11.2.0",
"@objectstack/account": "^15.1.1",
"@objectstack/cli": "^15.1.1",
"@objectstack/driver-memory": "^15.1.1",
"@objectstack/driver-sql": "^15.1.1",
"@objectstack/driver-sqlite-wasm": "^15.1.1",
"@objectstack/metadata": "^15.1.1",
"@objectstack/objectql": "^15.1.1",
"@objectstack/runtime": "^15.1.1",
"@objectstack/service-analytics": "^15.1.1",
"@objectstack/service-automation": "^15.1.1",
"@objectstack/spec": "^15.1.1",
"sql.js": "^1.14.1"
},
"optionalDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { P, F } from '@objectstack/spec';
*/
export const Assessment = ObjectSchema.create({
name: 'compliance_assessment',
sharingModel: 'private',
label: 'Assessment',
pluralLabel: 'Assessments',
icon: 'clipboard-check',
Expand Down Expand Up @@ -89,7 +90,7 @@ export const Assessment = ObjectSchema.create({
],

nameField: 'title',
compactLayout: ['title', 'control', 'status', 'remediation_status', 'cycle', 'assessed_at'],
highlightFields: ['title', 'control', 'status', 'remediation_status', 'cycle', 'assessed_at'],

validations: [
{
Expand Down
3 changes: 2 additions & 1 deletion packages/compliance/src/objects/compliance_control.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { P, F } from '@objectstack/spec';
*/
export const Control = ObjectSchema.create({
name: 'compliance_control',
sharingModel: 'private',
label: 'Control',
pluralLabel: 'Controls',
icon: 'shield',
Expand Down Expand Up @@ -124,7 +125,7 @@ export const Control = ObjectSchema.create({
],

nameField: 'display_name',
compactLayout: ['code', 'title', 'framework', 'criticality', 'last_status'],
highlightFields: ['code', 'title', 'framework', 'criticality', 'last_status'],

validations: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { P, F } from '@objectstack/spec';
*/
export const Evidence = ObjectSchema.create({
name: 'compliance_evidence',
sharingModel: 'private',
label: 'Evidence',
pluralLabel: 'Evidence',
icon: 'paperclip',
Expand Down Expand Up @@ -107,7 +108,7 @@ export const Evidence = ObjectSchema.create({
],

nameField: 'title',
compactLayout: ['title', 'control', 'evidence_type', 'status', 'expires_on'],
highlightFields: ['title', 'control', 'evidence_type', 'status', 'expires_on'],

validations: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const Framework = ObjectSchema.create({
name: 'compliance_framework',
sharingModel: 'public_read',
label: 'Framework',
pluralLabel: 'Frameworks',
icon: 'shield-check',
Expand Down Expand Up @@ -71,5 +72,5 @@ export const Framework = ObjectSchema.create({
indexes: [{ fields: ['short_name'] }, { fields: ['family'] }, { fields: ['status'] }],

nameField: 'short_name',
compactLayout: ['short_name', 'family', 'version', 'status', 'next_audit_date'],
highlightFields: ['short_name', 'family', 'version', 'status', 'next_audit_date'],
});
3 changes: 1 addition & 2 deletions packages/content/objectstack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,9 @@ export default defineStack({
translations: [ContentTranslations],

sharingRules: allSharingRules,
roles: RoleHierarchy.roles.map((r) => ({
positions: RoleHierarchy.roles.map((r) => ({
name: r.name,
label: r.label,
parent: r.parentRole ?? undefined,
})),

data: ContentSeedData,
Expand Down
22 changes: 11 additions & 11 deletions packages/content/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"test": "objectstack build"
},
"dependencies": {
"@objectstack/account": "^11.2.0",
"@objectstack/cli": "^11.2.0",
"@objectstack/driver-memory": "^11.2.0",
"@objectstack/driver-sql": "^11.2.0",
"@objectstack/driver-sqlite-wasm": "^11.2.0",
"@objectstack/metadata": "^11.2.0",
"@objectstack/objectql": "^11.2.0",
"@objectstack/runtime": "^11.2.0",
"@objectstack/service-analytics": "^11.2.0",
"@objectstack/service-automation": "^11.2.0",
"@objectstack/spec": "^11.2.0",
"@objectstack/account": "^15.1.1",
"@objectstack/cli": "^15.1.1",
"@objectstack/driver-memory": "^15.1.1",
"@objectstack/driver-sql": "^15.1.1",
"@objectstack/driver-sqlite-wasm": "^15.1.1",
"@objectstack/metadata": "^15.1.1",
"@objectstack/objectql": "^15.1.1",
"@objectstack/runtime": "^15.1.1",
"@objectstack/service-analytics": "^15.1.1",
"@objectstack/service-automation": "^15.1.1",
"@objectstack/spec": "^15.1.1",
"sql.js": "^1.14.1"
},
"optionalDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_channel.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const Channel = ObjectSchema.create({
name: 'content_channel',
sharingModel: 'public_read',
label: 'Channel',
pluralLabel: 'Channels',
icon: 'megaphone',
Expand Down Expand Up @@ -74,5 +75,5 @@ export const Channel = ObjectSchema.create({
indexes: [{ fields: ['name'], unique: true }, { fields: ['kind'] }],

nameField: 'name',
compactLayout: ['name', 'kind', 'default_cta_goal', 'active'],
highlightFields: ['name', 'kind', 'default_cta_goal', 'active'],
});
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_competitor.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const Competitor = ObjectSchema.create({
name: 'content_competitor',
sharingModel: 'public_read',
label: 'Competitor',
pluralLabel: 'Competitors',
icon: 'eye',
Expand Down Expand Up @@ -60,5 +61,5 @@ export const Competitor = ObjectSchema.create({
indexes: [{ fields: ['name'], unique: true }, { fields: ['category'] }],

nameField: 'name',
compactLayout: ['name', 'category', 'website'],
highlightFields: ['name', 'category', 'website'],
});
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_cta.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { P } from '@objectstack/spec';
*/
export const Cta = ObjectSchema.create({
name: 'content_cta',
sharingModel: 'private',
label: 'CTA',
pluralLabel: 'CTAs',
icon: 'mouse-pointer-click',
Expand Down Expand Up @@ -66,7 +67,7 @@ export const Cta = ObjectSchema.create({
indexes: [{ fields: ['piece'] }, { fields: ['goal'] }],

nameField: 'label_text',
compactLayout: ['label_text', 'goal', 'piece', 'is_primary'],
highlightFields: ['label_text', 'goal', 'piece', 'is_primary'],

validations: [
{
Expand Down
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_metric.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const Metric = ObjectSchema.create({
name: 'content_metric',
sharingModel: 'private',
label: 'Metric Snapshot',
pluralLabel: 'Metric Snapshots',
icon: 'bar-chart-2',
Expand Down Expand Up @@ -67,5 +68,5 @@ export const Metric = ObjectSchema.create({
// related-record reference the server can't resolve into a title here
// (ADR-0072), so it is dropped. Degraded to the local `period_start`.
nameField: 'period_start',
compactLayout: ['publication', 'period_start', 'period_end', 'views', 'signups', 'revenue'],
highlightFields: ['publication', 'period_start', 'period_end', 'views', 'signups', 'revenue'],
});
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_piece.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { P, F } from '@objectstack/spec';
*/
export const Piece = ObjectSchema.create({
name: 'content_piece',
sharingModel: 'private',
label: 'Content Piece',
pluralLabel: 'Content Pieces',
icon: 'file-text',
Expand Down Expand Up @@ -224,7 +225,7 @@ export const Piece = ObjectSchema.create({
],

nameField: 'title',
compactLayout: ['title', 'status', 'format', 'assignee', 'publish_at'],
highlightFields: ['title', 'status', 'format', 'assignee', 'publish_at'],

validations: [
{
Expand Down
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_publication.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const Publication = ObjectSchema.create({
name: 'content_publication',
sharingModel: 'private',
label: 'Publication',
pluralLabel: 'Publications',
icon: 'send',
Expand Down Expand Up @@ -112,5 +113,5 @@ export const Publication = ObjectSchema.create({
// title here (ADR-0072), so both are dropped. Degraded to the local
// `published_at` (the only identifying local scalar).
nameField: 'published_at',
compactLayout: ['piece', 'channel', 'published_at', 'total_views', 'total_signups'],
highlightFields: ['piece', 'channel', 'published_at', 'total_views', 'total_signups'],
});
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_signal.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { P } from '@objectstack/spec';
*/
export const Signal = ObjectSchema.create({
name: 'content_signal',
sharingModel: 'private',
label: 'Signal',
pluralLabel: 'Signals',
icon: 'rss',
Expand Down Expand Up @@ -136,7 +137,7 @@ export const Signal = ObjectSchema.create({
],

nameField: 'headline',
compactLayout: ['headline', 'source_kind', 'competitor', 'impact', 'status'],
highlightFields: ['headline', 'source_kind', 'competitor', 'impact', 'status'],

validations: [
{
Expand Down
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_template.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const ContentTemplate = ObjectSchema.create({
name: 'content_template',
sharingModel: 'public_read',
label: 'Template',
pluralLabel: 'Templates',
icon: 'layout-template',
Expand Down Expand Up @@ -67,5 +68,5 @@ export const ContentTemplate = ObjectSchema.create({
indexes: [{ fields: ['name'], unique: true }, { fields: ['kind'] }],

nameField: 'name',
compactLayout: ['name', 'kind', 'target_channel', 'target_word_count'],
highlightFields: ['name', 'kind', 'target_channel', 'target_word_count'],
});
3 changes: 2 additions & 1 deletion packages/content/src/objects/content_topic.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { ObjectSchema, Field } from '@objectstack/spec/data';
*/
export const Topic = ObjectSchema.create({
name: 'content_topic',
sharingModel: 'public_read',
label: 'Topic',
pluralLabel: 'Topics',
icon: 'lightbulb',
Expand Down Expand Up @@ -126,5 +127,5 @@ export const Topic = ObjectSchema.create({
],

nameField: 'title',
compactLayout: ['title', 'pillar', 'funnel_stage', 'priority', 'owner', 'visibility'],
highlightFields: ['title', 'pillar', 'funnel_stage', 'priority', 'owner', 'visibility'],
});
8 changes: 5 additions & 3 deletions packages/content/src/sharing/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ export const TopicTeamScopeRule: SharingRule = {
'Topics marked visibility=team are readable+editable by every team member. Private topics remain owner-only.',
object: 'content_topic',
type: 'criteria',
// The role hierarchy puts `lead` at the top, so role_and_subordinates(lead)
// grants edit access to lead → contributor → viewer in one shot.
sharedWith: { type: 'role_and_subordinates', value: 'lead' },
// Positions are flat in @objectstack ≥12 (no subordinates — ADR-0090 D3), so
// the former role_and_subordinates(lead) grant becomes a share to the `lead`
// position. (The old lead → contributor → viewer inheritance is expressed via
// the positions/profiles rather than a role tree.)
sharedWith: { type: 'position', value: 'lead' },
accessLevel: 'edit',
condition: { dialect: 'cel', source: 'record.visibility == "team"' },
active: true,
Expand Down
3 changes: 1 addition & 2 deletions packages/contracts/objectstack.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,9 @@ export default defineStack({
translations: [ContractsTranslations],

sharingRules: [],
roles: RoleHierarchy.roles.map((r) => ({
positions: RoleHierarchy.roles.map((r) => ({
name: r.name,
label: r.label,
parent: r.parentRole ?? undefined,
})),

data: ContractsSeedData,
Expand Down
22 changes: 11 additions & 11 deletions packages/contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@
"test": "objectstack build"
},
"dependencies": {
"@objectstack/account": "^11.2.0",
"@objectstack/cli": "^11.2.0",
"@objectstack/driver-memory": "^11.2.0",
"@objectstack/driver-sql": "^11.2.0",
"@objectstack/driver-sqlite-wasm": "^11.2.0",
"@objectstack/metadata": "^11.2.0",
"@objectstack/objectql": "^11.2.0",
"@objectstack/runtime": "^11.2.0",
"@objectstack/service-analytics": "^11.2.0",
"@objectstack/service-automation": "^11.2.0",
"@objectstack/spec": "^11.2.0",
"@objectstack/account": "^15.1.1",
"@objectstack/cli": "^15.1.1",
"@objectstack/driver-memory": "^15.1.1",
"@objectstack/driver-sql": "^15.1.1",
"@objectstack/driver-sqlite-wasm": "^15.1.1",
"@objectstack/metadata": "^15.1.1",
"@objectstack/objectql": "^15.1.1",
"@objectstack/runtime": "^15.1.1",
"@objectstack/service-analytics": "^15.1.1",
"@objectstack/service-automation": "^15.1.1",
"@objectstack/spec": "^15.1.1",
"sql.js": "^1.14.1"
},
"optionalDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion packages/contracts/src/objects/contracts_contract.object.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import { P, F } from '@objectstack/spec';
*/
export const Contract = ObjectSchema.create({
name: 'contracts_contract',
sharingModel: 'private',
label: 'Contract',
pluralLabel: 'Contracts',
icon: 'file-text',
Expand Down Expand Up @@ -262,7 +263,7 @@ export const Contract = ObjectSchema.create({
],

nameField: 'title',
compactLayout: ['title', 'party', 'contract_type', 'status', 'total_value', 'end_date'],
highlightFields: ['title', 'party', 'contract_type', 'status', 'total_value', 'end_date'],

validations: [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { P, F } from '@objectstack/spec';
*/
export const Obligation = ObjectSchema.create({
name: 'contracts_obligation',
sharingModel: 'private',
label: 'Obligation',
pluralLabel: 'Obligations',
icon: 'check-circle',
Expand Down Expand Up @@ -119,7 +120,7 @@ export const Obligation = ObjectSchema.create({
],

nameField: 'summary',
compactLayout: ['summary', 'contract', 'kind', 'status', 'due_date', 'amount'],
highlightFields: ['summary', 'contract', 'kind', 'status', 'due_date', 'amount'],

validations: [
{
Expand Down
Loading
Loading