@dosgato/api 0.0.2 → 0.0.3

package/dist/fixturetemplates.d.ts

@@ -1,110 +1,13 @@
-import { APITemplateType, WebLink } from '@dosgato/templating';
-export declare const PageTemplate1: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {
-        links: string[];
-        main: string[];
-    };
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
-export declare const PageTemplate2: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {
-        content: string[];
-    };
-    migrations: never[];
-    getLinks: (data: any) => WebLink[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<Record<string, string[]>>;
-};
-export declare const PageTemplate3: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {
-        content: string[];
-    };
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
-export declare const PageTemplate4: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {
-        content: string[];
-    };
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
-export declare const LinkComponent: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {};
-    migrations: never[];
-    getLinks: (data: any) => any[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
-export declare const PanelComponent: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {};
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
-export declare const QuoteComponent: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {};
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
-export declare const ColorData: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {};
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<Record<string, string[]>>;
-};
-export declare const BuildingData: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {};
-    migrations: never[];
-    getLinks: (data: any) => WebLink[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<Record<string, string[]>>;
-};
-export declare const ArticleData: {
-    type: APITemplateType;
-    templateKey: string;
-    name: string;
-    areas: {};
-    migrations: never[];
-    getLinks: (data: any) => never[];
-    getFulltext: (data: any) => any[];
-    validate: (data: any) => Promise<{}>;
-};
+import { APIComponentTemplate, APIPageTemplate, APIDataTemplate } from '@dosgato/templating';
+export declare const PageTemplate1: APIPageTemplate;
+export declare const PageTemplate2: APIPageTemplate;
+export declare const PageTemplate3: APIPageTemplate;
+export declare const PageTemplate4: APIPageTemplate;
+export declare const LinkComponent: APIComponentTemplate;
+export declare const PanelComponent: APIComponentTemplate;
+export declare const QuoteComponent: APIComponentTemplate;
+export declare const RichTextComponent: APIComponentTemplate;
+export declare const TextImageComponent: APIComponentTemplate;
+export declare const ColorData: APIDataTemplate;
+export declare const BuildingData: APIDataTemplate;
+export declare const ArticleData: APIDataTemplate;

package/dist/fixturetemplates.js

@@ -1,4 +1,5 @@
-import { isNull } from 'txstate-utils';
+import { extractLinksFromText, getKeywords } from '@dosgato/templating';
+import { isBlank } from 'txstate-utils';
 export const PageTemplate1 = {
     type: 'page',
     templateKey: 'keyp1',
@@ -11,9 +12,6 @@ export const PageTemplate1 = {
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.title];
-    },
-    validate: async (data) => {
-        return {};
     }
 };
 export const PageTemplate2 = {
@@ -34,11 +32,11 @@ export const PageTemplate2 = {
         return [data.title];
     },
     validate: async (data) => {
-        const ret = {};
-        if (isNull(data.title)) {
-            ret.title = ['Page title is required.'];
+        const errors = [];
+        if (isBlank(data.title)) {
+            errors.push({ path: 'title', message: 'Page title is required.' });
         }
-        return ret;
+        return errors;
     }
 };
 export const PageTemplate3 = {
@@ -52,9 +50,6 @@ export const PageTemplate3 = {
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.title];
-    },
-    validate: async (data) => {
-        return {};
     }
 };
 export const PageTemplate4 = {
@@ -68,78 +63,107 @@ export const PageTemplate4 = {
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.title];
-    },
-    validate: async (data) => {
-        return {};
     }
 };
 export const LinkComponent = {
     type: 'component',
     templateKey: 'keyc1',
-    name: 'componenttemplate1',
-    areas: {},
+    name: 'Link',
     migrations: [],
     getLinks: (data) => {
         return [data.link];
     },
     getFulltext: (data) => {
-        return [data.text];
+        return getKeywords(data.text);
     },
     validate: async (data) => {
-        return {};
+        const errors = [];
+        if (isBlank(data.link))
+            errors.push({ path: 'link', message: 'Link target is required.' });
+        return errors;
     }
 };
 export const PanelComponent = {
     type: 'component',
     templateKey: 'keyc2',
-    name: 'componenttemplate2',
-    areas: {},
+    name: 'Panel',
+    areas: {
+        content: [
+            'keyc3',
+            'richtext'
+        ]
+    },
     migrations: [],
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.text, data.title];
-    },
-    validate: async (data) => {
-        return {};
     }
 };
 export const QuoteComponent = {
     type: 'component',
     templateKey: 'keyc3',
-    name: 'componenttemplate3',
-    areas: {},
+    name: 'Quote',
     migrations: [],
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.quote, data.author];
+    }
+};
+export const RichTextComponent = {
+    type: 'component',
+    templateKey: 'richtext',
+    name: 'Rich Text',
+    areas: {},
+    migrations: [],
+    getLinks: (data) => extractLinksFromText(data.text),
+    getFulltext: (data) => {
+        return [...getKeywords(data.title), ...getKeywords(data.text)];
+    },
+    validate: async (data) => {
+        const errors = [];
+        if (isBlank(data.text))
+            errors.push({ message: 'Rich text is required.', path: 'text' });
+        return errors;
+    }
+};
+export const TextImageComponent = {
+    type: 'component',
+    templateKey: 'textimage',
+    name: 'Text & Image',
+    areas: {},
+    migrations: [],
+    getLinks: (data) => extractLinksFromText(data.text),
+    getFulltext: (data) => {
+        return [...getKeywords(data.title), ...getKeywords(data.text)];
     },
     validate: async (data) => {
-        return {};
+        const errors = [];
+        if (isBlank(data.title))
+            errors.push({ path: 'title', message: 'Title is required.' });
+        return errors;
     }
 };
 export const ColorData = {
     type: 'data',
     templateKey: 'keyd1',
-    name: 'datatemplate1',
-    areas: {},
+    name: 'Colors',
     migrations: [],
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.title];
     },
     validate: async (data) => {
-        const ret = {};
-        if (isNull(data.title)) {
-            ret.title = ['Title is required'];
+        const errors = [];
+        if (isBlank(data.title)) {
+            errors.push({ path: 'title', message: 'Title is required' });
         }
-        return ret;
+        return errors;
     }
 };
 export const BuildingData = {
     type: 'data',
     templateKey: 'keyd2',
-    name: 'datatemplate2',
-    areas: {},
+    name: 'Buildings',
     migrations: [],
     getLinks: (data) => {
         const links = [];
@@ -151,28 +175,24 @@ export const BuildingData = {
         return [data.name];
     },
     validate: async (data) => {
-        const ret = {};
-        if (isNull(data.name)) {
-            ret.name = ['Building name is required', 'You can not leave the building name blank.'];
+        const errors = [];
+        if (isBlank(data.name)) {
+            errors.push({ path: 'name', message: 'Building name is required.' });
         }
         if (data.floors && data.floors > 5) {
-            ret.floors = ['Building is too tall. Too many stairs to climb'];
+            errors.push({ path: 'floors', message: 'Building is too tall. Too many stairs to climb' });
         }
-        return ret;
+        return errors;
     }
 };
 export const ArticleData = {
     type: 'data',
     templateKey: 'articledatakey',
-    name: 'articledata',
-    areas: {},
+    name: 'Articles',
     migrations: [],
     getLinks: (data) => [],
     getFulltext: (data) => {
         return [data.title, data.author];
-    },
-    validate: async (data) => {
-        return {};
     }
 };
 //# sourceMappingURL=fixturetemplates.js.map

package/dist/fixturetemplates.js.map

@@ -1 +1 @@
-{"version":3,"file":"fixturetemplates.js","sourceRoot":"","sources":["../src/fixturetemplates.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fixturetemplates.js","sourceRoot":"","sources":["../src/fixturetemplates.ts"],"names":[],"mappings":"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"}

package/dist/globalrule/globalrule.database.js

@@ -22,9 +22,13 @@ export async function createGlobalRule(args) {
     }
     binds.push(args.roleId);
     if (args.grants) {
-        if (args.grants.manageUsers) {
-            columns.push('manageUsers');
-            binds.push(args.grants.manageUsers);
+        if (args.grants.manageAccess) {
+            columns.push('manageAccess');
+            binds.push(args.grants.manageAccess);
+        }
+        if (args.grants.manageParentRoles) {
+            columns.push('manageParentRoles');
+            binds.push(args.grants.manageParentRoles);
         }
         if (args.grants.createSites) {
             columns.push('createSites');
@@ -34,6 +38,14 @@ export async function createGlobalRule(args) {
             columns.push('manageGlobalData');
             binds.push(args.grants.manageGlobalData);
         }
+        if (args.grants.viewSiteList) {
+            columns.push('viewSiteList');
+            binds.push(args.grants.viewSiteList);
+        }
+        if (args.grants.manageTemplates) {
+            columns.push('manageTemplates');
+            binds.push(args.grants.manageTemplates);
+        }
     }
     return await db.insert(`INSERT INTO globalrules (${columns.join(',')}) VALUES(${columns.map((c) => '?').join(',')})`, binds);
 }
@@ -41,9 +53,13 @@ export async function updateGlobalRule(args) {
     const updates = [];
     const binds = [];
     if (args.grants) {
-        if (isNotNull(args.grants.manageUsers)) {
-            updates.push('`manageUsers` = ?');
-            binds.push(args.grants.manageUsers);
+        if (isNotNull(args.grants.manageAccess)) {
+            updates.push('`manageAccess` = ?');
+            binds.push(args.grants.manageAccess);
+        }
+        if (isNotNull(args.grants.manageParentRoles)) {
+            updates.push('`manageParentRoles` = ?');
+            binds.push(args.grants.manageParentRoles);
         }
         if (isNotNull(args.grants.createSites)) {
             updates.push('`createSites` = ?');
@@ -53,6 +69,14 @@ export async function updateGlobalRule(args) {
             updates.push('`manageGlobalData` = ?');
             binds.push(args.grants.manageGlobalData);
         }
+        if (isNotNull(args.grants.viewSiteList)) {
+            updates.push('`viewSiteList` = ?');
+            binds.push(args.grants.viewSiteList);
+        }
+        if (isNotNull(args.grants.manageTemplates)) {
+            updates.push('`manageTemplates` = ?');
+            binds.push(args.grants.manageTemplates);
+        }
     }
     binds.push(String(args.ruleId));
     return await db.update(`UPDATE globalrules

package/dist/globalrule/globalrule.database.js.map

@@ -1 +1 @@
-{"version":3,"file":"globalrule.database.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.database.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"globalrule.database.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.database.ts"],"names":[],"mappings":"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"}

package/dist/globalrule/globalrule.model.d.ts

@@ -1,8 +1,11 @@
 import { ValidatedResponse, ValidatedResponseArgs } from '@txstate-mws/graphql-server';
 export declare class GlobalRuleGrants {
-    manageUsers: boolean;
+    manageAccess: boolean;
+    manageParentRoles: boolean;
     createSites: boolean;
     manageGlobalData: boolean;
+    viewSiteList: boolean;
+    manageTemplates: boolean;
     constructor(row?: any);
 }
 export declare class GlobalRule {

package/dist/globalrule/globalrule.model.js

@@ -13,16 +13,23 @@ import { RuleType } from '../internal.js';
 let GlobalRuleGrants = class GlobalRuleGrants {
     constructor(row) {
         if (row) {
-            this.manageUsers = !!row.manageUsers;
+            this.manageAccess = !!row.manageAccess;
+            this.manageParentRoles = !!row.manageParentRoles;
             this.createSites = !!row.createSites;
             this.manageGlobalData = !!row.manageGlobalData;
+            this.viewSiteList = !!row.viewSiteList;
+            this.manageTemplates = !!row.manageTemplates;
         }
     }
 };
 __decorate([
-    Field({ description: 'Grants ability to create/read/update/delete all roles, add roles to users and groups, and add users to groups.' }),
+    Field({ description: 'Grants ability to create/edit sub-roles, create/enable/disable/edit users, and assign users to roles associated with a site.' }),
     __metadata("design:type", Boolean)
-], GlobalRuleGrants.prototype, "manageUsers", void 0);
+], GlobalRuleGrants.prototype, "manageAccess", void 0);
+__decorate([
+    Field({ description: 'Grants ability to create/edit top-level roles and assign users to roles not associated with a site.' }),
+    __metadata("design:type", Boolean)
+], GlobalRuleGrants.prototype, "manageParentRoles", void 0);
 __decorate([
     Field({ description: 'Grants ability to create new sites in the system.' }),
     __metadata("design:type", Boolean)
@@ -31,6 +38,14 @@ __decorate([
     Field({ description: 'Grants ability to edit global data. Site-related data is governed by datarules instead.' }),
     __metadata("design:type", Boolean)
 ], GlobalRuleGrants.prototype, "manageGlobalData", void 0);
+__decorate([
+    Field({ description: 'Grants ability to view the entire site list and details like launch url, owner, managers, comments.' }),
+    __metadata("design:type", Boolean)
+], GlobalRuleGrants.prototype, "viewSiteList", void 0);
+__decorate([
+    Field({ description: 'Grants ability to assign templates to sites and pagetrees and set templates as universal' }),
+    __metadata("design:type", Boolean)
+], GlobalRuleGrants.prototype, "manageTemplates", void 0);
 GlobalRuleGrants = __decorate([
     ObjectType(),
     InputType('GlobalRuleGrantsInput'),

package/dist/globalrule/globalrule.model.js.map

@@ -1 +1 @@
-{"version":3,"file":"globalrule.model.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAyB,MAAM,6BAA6B,CAAA;AACtF,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIzC,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAU3B,YAAa,GAAS;QACpB,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAA;YACpC,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,WAAW,CAAA;YACpC,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC,GAAG,CAAC,gBAAgB,CAAA;SAC/C;IACH,CAAC;CACF,CAAA;AAfC;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,gHAAgH,EAAE,CAAC;;qDACpH;AAGrB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,mDAAmD,EAAE,CAAC;;qDACvD;AAGrB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,yFAAyF,EAAE,CAAC;;0DACxF;AARf,gBAAgB;IAF5B,UAAU,EAAE;IACZ,SAAS,CAAC,uBAAuB,CAAC;;GACtB,gBAAgB,CAiB5B;SAjBY,gBAAgB;AAoB7B,IAAa,UAAU,GAAvB,MAAa,UAAU;IAYrB,YAAa,GAAQ;QAPrB,SAAI,GAAW,QAAQ,CAAC,MAAM,CAAA;QAQ5B,IAAI,CAAC,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACxB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,IAAI,gBAAgB,CAAC,GAAG,CAAC,CAAA;IACzC,CAAC;CACF,CAAA;AAfC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;;sCACR;AAGV;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,2DAA2D,EAAE,CAAC;;wCACxE;AAG9B;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,mCAAmC,EAAE,CAAC;8BACpD,gBAAgB;0CAAA;AARb,UAAU;IADtB,UAAU,CAAC,EAAE,WAAW,EAAE,0MAA0M,EAAE,CAAC;;GAC3N,UAAU,CAiBtB;SAjBY,UAAU;AAoBvB,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAG5B,CAAA;AAHY,gBAAgB;IAD5B,SAAS,EAAE;GACC,gBAAgB,CAG5B;SAHY,gBAAgB;AAM7B,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;CAMjC,CAAA;AAJC;IADC,KAAK,EAAE;;qDACO;AAGf;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC3C,gBAAgB;qDAAA;AALd,qBAAqB;IADjC,SAAS,EAAE;GACC,qBAAqB,CAMjC;SANY,qBAAqB;AASlC,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;CAMjC,CAAA;AAJC;IADC,KAAK,EAAE;;qDACO;AAGf;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAC3C,gBAAgB;qDAAA;AALd,qBAAqB;IADjC,SAAS,EAAE;GACC,qBAAqB,CAMjC;SANY,qBAAqB;AASlC,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,iBAAiB;IAIvD,YAAa,MAA2D;QACtE,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAA;IACrC,CAAC;CACF,CAAA;AANC;IADC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACb,UAAU;sDAAA;AAFZ,kBAAkB;IAD9B,UAAU,EAAE;;GACA,kBAAkB,CAQ9B;SARY,kBAAkB;AAW/B,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;CAAG,CAAA;AAAxB,qBAAqB;IADjC,UAAU,EAAE;GACA,qBAAqB,CAAG;SAAxB,qBAAqB"}
+{"version":3,"file":"globalrule.model.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.model.ts"],"names":[],"mappings":"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"}

package/dist/globalrule/globalrule.service.js

@@ -102,7 +102,7 @@ export class GlobalRuleService extends DosGatoService {
         return await this.svc(RoleService).mayUpdate(role);
     }
     async mayView(rule) {
-        if (await this.haveGlobalPerm('manageUsers'))
+        if (await this.haveGlobalPerm('manageAccess'))
             return true;
         const role = await this.svc(RoleServiceInternal).findById(rule.roleId);
         return !!role;

package/dist/globalrule/globalrule.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"globalrule.service.js","sourceRoot":"","sources":["../../src/globalrule/globalrule.service.ts"],"names":[],"mappings":"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"}

package/dist/group/group.database.d.ts

@@ -15,27 +15,17 @@ export declare function getGroupsWithUser(userIds: string[]): Promise<{
     key: any;
     value: Group;
 }[]>;
-export declare function getGroupsWithSite(siteIds: string[]): Promise<{
-    key: any;
-    value: Group;
-}[]>;
-export declare function getGroupsWithManager(managerIds: string[], direct?: boolean): Promise<{
-    key: any;
-    value: Group;
-}[]>;
 export declare function getGroupsWithRole(roleIds: string[], filter?: GroupFilter): Promise<{
     key: string;
     value: Group;
 }[]>;
-export declare function createGroup(name: string): Promise<number>;
+export declare function groupNameIsUnique(name: string): Promise<boolean>;
+export declare function createGroup(name: string, parent?: Group): Promise<number>;
 export declare function updateGroup(id: string, name: string): Promise<number>;
 export declare function deleteGroup(id: string): Promise<void>;
 export declare function addUserToGroups(groupIds: string[], userId: number): Promise<number>;
 export declare function removeUserFromGroups(groupIds: string[], userId: number): Promise<number>;
 export declare function setUserGroups(userId: number, groupIds: string[]): Promise<number>;
-export declare function setGroupManager(groupId: string, userId: number, manager: boolean): Promise<void>;
-export declare function addGroupSite(groupId: string, siteId: string): Promise<number>;
-export declare function removeGroupSite(groupId: string, siteId: string): Promise<number>;
 export declare function addSubgroup(parentId: string, childId: string): Promise<number>;
 export declare function removeSubgroup(parentId: string, childId: string): Promise<number>;
 export {};