npm-packager-ui and finder are restored

deep-foundation · Jul 30, 2023 · d83d40e · d83d40e
1 parent a212dd5
commit d83d40e
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 49 deletions.
diff --git a/migrations/1664940577200-tsx.ts b/migrations/1664940577200-tsx.ts
@@ -30,32 +30,30 @@ export const importPackage = async (pckg) => {
   return importResult;
 }
 
-export const sharePermissions = async (userId, packageId, createContain = true) => {
-  const links = [
-    {
-      type_id: await root.id('@deep-foundation/core', 'Join'),
-      from_id: packageId,
-      to_id: userId,
-    }
-  ];
-  if (createContain) {
-    links.push({
-      type_id: await root.id('@deep-foundation/core', 'Contain'),
-      from_id: userId,
-      to_id: packageId,
-    });
-  }
-  await root.insert(links);
+export const sharePermissions = async (userId, packageId) => {
+  return await root.insert({
+    type_id: await root.id('@deep-foundation/core', 'Join'),
+    from_id: packageId,
+    to_id: userId,
+  });
+}
+
+export const containWithin = async (containerId, containedId) => {
+  return await root.insert({
+    type_id: await root.id('@deep-foundation/core', 'Contain'),
+    from_id: containerId,
+    to_id: containedId,
+  });
 }
 
 export const up = async () => {
   log('up');
   const importResult = await importPackage(tsxPckg);
   log(importResult);
-  const packageId = importResult?.packageId;
-  if (packageId) {
-    await sharePermissions(await root.id('deep', 'admin'), packageId);
-  }
+  const packageId = importResult.packageId;
+  const adminId = await root.id('deep', 'admin');
+  await sharePermissions(adminId, packageId);
+  await containWithin(adminId, packageId);
 };
 
 export const down = async () => {

diff --git a/migrations/1677340638677-npm-packager.ts b/migrations/1677340638677-npm-packager.ts
@@ -2,7 +2,7 @@ import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import Debug from 'debug';
 import { DeepClient } from '../imports/client.js';
 import npmPackagerPckg from '@deep-foundation/npm-packager/deep.json' assert { type: 'json'};
-import { importPackage, sharePermissions } from './1664940577200-tsx.js';
+import { importPackage, sharePermissions, containWithin } from './1664940577200-tsx.js';
 
 const debug = Debug('deeplinks:migrations:npm-packager');
 const log = debug.extend('log');
@@ -22,10 +22,10 @@ export const up = async () => {
   log('up');
   const importResult = await importPackage(npmPackagerPckg);
   log(importResult);
-  const packageId = importResult?.packageId;
-  if (packageId) {
-    await sharePermissions(await root.id('deep', 'admin'), packageId);
-  }
+  const packageId = importResult.packageId;
+  const adminId = await root.id('deep', 'admin');
+  await sharePermissions(adminId, packageId);
+  await containWithin(adminId, packageId);
 };
 
 export const down = async () => {

diff --git a/migrations/1678940577209-deepcase.ts b/migrations/1678940577209-deepcase.ts
@@ -1,8 +1,7 @@
 import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import Debug from 'debug';
 import { DeepClient } from '../imports/client.js';
-// import deepcasePckg from '@deep-foundation/deepcase/deep.json' assert { type: 'json'};
-import { importPackage, sharePermissions } from './1664940577200-tsx.js';
+import { sharePermissions } from './1664940577200-tsx.js';
 
 const debug = Debug('deeplinks:migrations:deepcase');
 const log = debug.extend('log');
@@ -54,9 +53,8 @@ export const up = async () => {
 
   log('adminId', adminId);
   const packageId = await installPackage(deep, '@deep-foundation/deepcase');
-  if (packageId) {
-    await sharePermissions(adminId, packageId, false);
-  }
+  await sharePermissions(adminId, packageId);
+
   const usersCanInsertSafeLinks = await deep.id('deep', 'admin', 'usersCanInsertSafeLinks');
   const usersCanUpdateSafeLinks = await deep.id('deep', 'admin', 'usersCanUpdateSafeLinks');
   const usersCanDeleteSafeLinks = await deep.id('deep', 'admin', 'usersCanDeleteSafeLinks');

diff --git a/migrations/1680017137379-npm-packager-ui.ts b/migrations/1680017137379-npm-packager-ui.ts
@@ -1,8 +1,8 @@
 import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import Debug from 'debug';
 import { DeepClient } from '../imports/client.js';
-// import npmPackagerUiPckg from '@deep-foundation/npm-packager-ui/deep.json' assert { type: 'json'};
-// import { importPackage, sharePermissions } from './1664940577200-tsx.js';
+import { installPackage } from './1678940577209-deepcase.js';
+import { sharePermissions } from './1664940577200-tsx.js';
 
 const debug = Debug('deeplinks:migrations:npm-packager-ui');
 const log = debug.extend('log');
@@ -20,12 +20,13 @@ const root = new DeepClient({
 
 export const up = async () => {
   log('up');
-  // const importResult = await importPackage(npmPackagerUiPckg);
-  // log(importResult);
-  // const packageId = importResult?.packageId;
-  // if (packageId) {
-  //   await sharePermissions(await root.id('deep', 'admin'), packageId);
-  // }
+
+  const adminId = await root.id('deep', 'admin');
+  const admin = await root.login({ linkId: adminId });
+  const deep = new DeepClient({ deep: root, ...admin });
+
+  const packageId = await installPackage(deep, '@deep-foundation/npm-packager-ui');
+  await sharePermissions(adminId, packageId);
 };
 
 export const down = async () => {

diff --git a/migrations/1687790060025-finder.ts b/migrations/1687790060025-finder.ts
@@ -1,8 +1,8 @@
 import { generateApolloClient } from '@deep-foundation/hasura/client.js';
 import Debug from 'debug';
 import { DeepClient } from '../imports/client.js';
-// import pckg from '@deep-foundation/finder/deep.json' assert { type: 'json'};
-// import { importPackage, sharePermissions } from './1664940577200-tsx.js';
+import { installPackage } from './1678940577209-deepcase.js';
+import { sharePermissions } from './1664940577200-tsx.js';
 
 const debug = Debug('deeplinks:migrations:finder');
 const log = debug.extend('log');
@@ -20,15 +20,13 @@ const root = new DeepClient({
 
 export const up = async () => {
   log('up');
-  // log('pckg', JSON.stringify(pckg, null, 2));
-  // const importResult = await importPackage(pckg);
-  // log('importResult', JSON.stringify(importResult, null, 2));
-  // log(importResult);
-  // const packageId = importResult?.packageId;
-  // log('packageId', packageId);
-  // if (packageId) {
-  //   await sharePermissions(await root.id('deep', 'admin'), packageId);
-  // }
+
+  const adminId = await root.id('deep', 'admin');
+  const admin = await root.login({ linkId: adminId });
+  const deep = new DeepClient({ deep: root, ...admin });
+
+  const packageId = await installPackage(deep, '@deep-foundation/finder');
+  await sharePermissions(adminId, packageId);
 };
 
 export const down = async () => {