Merge pull request #72 from ltonetwork/OwnablesKeywords

keywords added to ownables

Author: stiemsdev

Diff for: src/App.tsx

@@ -32,7 +32,7 @@ export default function App() {
   const [showSidebar, setShowSidebar] = useState(false);
   const [showPackages, setShowPackages] = React.useState(false);
   const [address, setAddress] = useState(LTOService.address);
-  const [ownables, setOwnables] = useState<Array<{chain: EventChain, package: string}>>([]);
+  const [ownables, setOwnables] = useState<Array<{chain: EventChain, package: string, keywords:string[]}>>([]);
   const [consuming, setConsuming] = useState<{chain: EventChain, package: string, info: TypedOwnableInfo}|null>(null);
   const [alert, setAlert] = useState<{title: string, message: React.ReactNode, severity: AlertColor}|null>(null);
   const [confirm, setConfirm] =
@@ -62,7 +62,7 @@ export default function App() {
 
   const forge = async (pkg: TypedPackage) => {
     const chain = OwnableService.create(pkg);
-    setOwnables([...ownables, {chain, package: pkg.cid}]);
+    setOwnables([...ownables, {chain, package: pkg.cid, keywords: pkg.keywords || []}]);
     setShowPackages(false);
     enqueueSnackbar(`${pkg.title} forged`, {variant: "success"});
   }

Diff for: src/interfaces/TypedPackage.d.ts

@@ -13,6 +13,7 @@ export interface TypedPackage extends TypedPackageCapabilities {
   description?: string;
   cid: string;
   versions: Array<{date: Date, cid: string}>;
+  keywords: string[];
 }
 
 export interface TypedPackageStub {

Diff for: src/services/EventChain.service.ts

@@ -11,6 +11,7 @@ interface StoredChainInfo {
   state: string;
   package: string;
   created: Date;
+  keywords: string[];
 }
 
 export default class EventChainService {
@@ -24,25 +25,27 @@ export default class EventChainService {
     this._anchoring = enabled;
   }
 
-  static async loadAll(): Promise<Array<{chain: EventChain, package: string, created: Date}>> {
+  static async loadAll(): Promise<Array<{chain: EventChain, package: string, created: Date, keywords: string[]}>> {
     const ids = (await IDBService.listStores())
       .filter(name => name.match(/^ownable:\w+$/))
       .map(name => name.replace(/^ownable:(\w+)$/, '$1'));
 
-    return (await Promise.all(ids.map(id => this.load(id))))
-      .sort(({created: a}, {created: b}) => a.getTime() - b.getTime())
+      return (await Promise.all(ids.map(async id => {
+        const { chain, package: packageCid, created, keywords} = await this.load(id);
+        return { chain, package: packageCid, created, keywords };
+      }))).sort(({created: a}, {created: b}) => a.getTime() - b.getTime());
   }
 
-  static async load(id: string): Promise<{chain: EventChain, package: string, created: Date}> {
+  static async load(id: string): Promise<{chain: EventChain, package: string, created: Date, keywords: string[]}> {
     const chainInfo = await IDBService.getMap(`ownable:${id}`)
       .then(map => Object.fromEntries(map.entries())) as StoredChainInfo;
 
-    const {chain: chainJson, package: packageCid, created} = chainInfo;
+    const {chain: chainJson, package: packageCid, created, keywords} = chainInfo;
 
-    return { chain: EventChain.from(chainJson), package: packageCid, created };
+    return { chain: EventChain.from(chainJson), package: packageCid, created, keywords };
   }
 
-  static async store(...chains: Array<{ chain: EventChain, stateDump: StateDump }>): Promise<void> {
+  static async store(...chains: Array<{ chain: EventChain, stateDump: StateDump,keywords?: string[] }>): Promise<void> {
     const anchors: Array<{ key: Binary, value: Binary }> = [];
     const data: TypedDict<TypedDict | Map<any, any>> = {};
 
@@ -66,7 +69,7 @@ export default class EventChainService {
     await IDBService.setAll(data);
   }
 
-  static async initStore(chain: EventChain, pkg: string, stateDump?: StateDump): Promise<void> {
+  static async initStore(chain: EventChain, pkg: string, stateDump?: StateDump, keywords?: string[]): Promise<void> {
     if (await IDBService.hasStore(`ownable:${chain.id}`)) {
       return;
     }
@@ -80,6 +83,7 @@ export default class EventChainService {
       latestHash: chain.latestHash.hex,
       package: pkg,
       created: new Date(),
+      keywords: keywords,
     };
 
     const data: TypedDict = {};

Diff for: src/services/Ownable.service.ts

@@ -38,7 +38,7 @@ export interface OwnableRPC {
 export default class OwnableService {
   private static readonly _rpc = new Map<string,OwnableRPC>();
 
-  static async loadAll(): Promise<Array<{chain: EventChain, package: string, created: Date}>> {
+  static async loadAll(): Promise<Array<{chain: EventChain, package: string, created: Date, keywords: string[]}>> {
     return EventChainService.loadAll();
   }
 
@@ -73,6 +73,7 @@ export default class OwnableService {
         ownable_id: chain.id,
         package: pkg.cid,
         network_id: LTOService.networkId,
+        keywords: pkg.keywords,
       };
 
       new Event(msg)
@@ -223,6 +224,7 @@ export default class OwnableService {
       state: chain.state.hex,
       package: pkg,
       created: new Date(),
+      keywords: PackageService.info(pkg).keywords,
     };
 
     const data: TypedDict = {};

Diff for: src/services/Package.service.ts

@@ -54,16 +54,17 @@ export default class PackageService {
     name: string,
     description: string|undefined,
     cid: string,
-    capabilities: TypedPackageCapabilities
+    capabilities: TypedPackageCapabilities,
+    keywords: string[],
   ): TypedPackage {
     const packages = (LocalStorageService.get('packages') || []) as TypedPackage[];
     let pkg = packages.find(pkg => pkg.name === name);
 
     if (!pkg) {
-      pkg = {title, name, description, cid, ...capabilities, versions: []};
+      pkg = {title, name, description, cid, ...capabilities,keywords, versions: []};
       packages.push(pkg);
     } else {
-      Object.assign(pkg, {cid, description, ...capabilities});
+      Object.assign(pkg, {cid, description, ...capabilities, keywords});
     }
 
     pkg.versions.push({date: new Date(), cid});
@@ -140,9 +141,10 @@ export default class PackageService {
 
     const cid = await calculateCid(files);
     const capabilities = await this.getCapabilities(files);
+    const keywords: string[] = packageJson.keywords || '';
 
     await this.storeAssets(cid, files);
-    return this.storePackageInfo(title, name, description, cid, capabilities);
+    return this.storePackageInfo(title, name, description, cid, capabilities, keywords);
   }
 
   static async downloadExample(key: string): Promise<TypedPackage> {