Merge pull request #61 from alkem-io/develop

Release 0.8.0

.eslintrc.json

@@ -25,6 +25,7 @@
       "error",
       "single"
     ],
+    "curly": ["warn", "all"],
     "@typescript-eslint/interface-name-prefix": "off",
     "@typescript-eslint/explicit-function-return-type": "off",
     "@typescript-eslint/explicit-module-boundary-types": "off",

graphql/mutations/authorization-reset-account.graphql

@@ -0,0 +1,9 @@
+mutation authorizationPolicyResetOnAccount(
+  $authorizationResetData: AccountAuthorizationResetInput!
+) {
+  authorizationPolicyResetOnAccount(
+    authorizationResetData: $authorizationResetData
+  ) {
+    id
+  }
+}

graphql/queries/spaces-all-visibilities.graphql

@@ -2,5 +2,8 @@ query spacesAllVisibilities {
   spaces(filter: { visibilities: [DEMO, ARCHIVED, ACTIVE] }) {
     id
     nameID
+    account {
+      id
+    }
   }
 }

graphql/queries/spaces-challenge-opportunities.graphql → graphql/queries/spaces-subspace-subsubspaces.graphql

@@ -1,6 +1,6 @@
-query spaceChallengeOpportunities(
+query spaceSubspaceSubspaces(
   $spaceId: UUID_NAMEID!
-  $challengeId: UUID_NAMEID!
+  $subspaceId: UUID_NAMEID!
 ) {
   space(ID: $spaceId) {
     id
@@ -12,7 +12,7 @@ query spaceChallengeOpportunities(
     collaboration {
       id
     }
-    challenge(ID: $challengeId) {
+    subspace(ID: $subspaceId) {
       id
       nameID
       profile {
@@ -26,7 +26,7 @@ query spaceChallengeOpportunities(
           type
         }
       }
-      opportunities {
+      subspaces {
         nameID
         profile {
           displayName

graphql/queries/spaces-challenges-callouts.graphql → graphql/queries/spaces-subspaces-collaboration.graphql

@@ -1,4 +1,4 @@
-query spaceChallengesCallouts {
+query spaceSubspacesCollaboration {
   spaces {
     id
     nameID
@@ -9,7 +9,7 @@ query spaceChallengesCallouts {
         id
       }
     }
-    challenges {
+    subspaces {
       id
       nameID
       collaboration {

graphql/queries/spaces-challenges-communities.graphql → graphql/queries/spaces-subspaces-communities.graphql

@@ -1,11 +1,11 @@
-query spaceChallengesCommunities($spaceId: UUID_NAMEID!) {
+query spaceSubspacesCommunities($spaceId: UUID_NAMEID!) {
   space(ID: $spaceId) {
     id
     nameID
     community {
       id
     }
-    challenges {
+    subspaces {
       id
       nameID
       community {

graphql/queries/task.graphql

@@ -0,0 +1,7 @@
+query task($taskId: UUID!) {
+  task(id: $taskId) {
+    status
+    results
+    errors
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alkemio/cli",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "author": "Alkemio Foundation",
   "private": false,
   "license": "EUPL-1.2",
@@ -19,14 +19,13 @@
     "lint": "tsc --noEmit && eslint src/**/*.ts{,x}",
     "lint:fix": "tsc --noEmit && eslint src/**/*.ts{,x} --fix",
     "nodemon": "nodemon",
-    "delete-space-force": "ts-node-dev src/delete-space-force.ts",
     "delete-organization": "ts-node-dev src/delete-organization.ts",
     "remove-user-from-organizations": "ts-node-dev src/remove-user-from-organizations.ts",
     "authorization-reset-platform": "ts-node-dev src/authorization-reset-platform.ts",
     "authorization-reset-with-config": "ts-node-dev src/authorization-reset-all.ts true",
     "authorization-reset-all": "ts-node-dev src/authorization-reset-all.ts",
     "authorization-reset-all-users": "ts-node-dev src/authorization-reset-all-users.ts",
-    "authorization-reset-all-spaces": "ts-node-dev src/authorization-reset-all-spaces.ts",
+    "authorization-reset-all-accounts": "ts-node-dev src/authorization-reset-all-accounts.ts",
     "authorization-reset-all-organizations": "ts-node-dev src/authorization-reset-all-organizations.ts",
     "authorization-detect-orphaned-credentials-from-users": "ts-node-dev src/orphaned-credentials/authorization-detect-orphaned-credentials-from-users.ts",
     "migration-add-default-discussion-callouts": "ts-node-dev src/migration/add-default-discussion-callouts.ts",
@@ -36,6 +35,9 @@
     "prepublishOnly": "npm run build",
     "codegen": "graphql-codegen --config codegen.yml",
     "prune-orphans": "ts-node-dev src/prune-orphan-data/prune-orphan-data.ts",
+    "digital-twin-demo": "ts-node-dev src/digital-twin-demo/digital-twin-demo.ts",
+    "prune-orphans-old": "ts-node-dev src/prune-orphan-data/prune-orphan-data.ts",
+    "prune-orphans-v2": "ts-node-dev src/prune-orphan-data/prune-orphan-data-v2.ts",
     "search-ingestion": "ts-node-dev src/search-ingestion/search-ingestion.ts"
   },
   "repository": {
@@ -61,7 +63,7 @@
     "ts-node-dev": "^2.0.0"
   },
   "dependencies": {
-    "@alkemio/client-lib": "^0.27.0",
+    "@alkemio/client-lib": "^0.30.4",
     "@graphql-codegen/typescript-graphql-request": "^4.5.3",
     "@graphql-codegen/typescript-operations": "^2.5.3",
     "@types/graphql-upload": "^8.0.11",

src/authorization-reset-all-spaces.ts → src/authorization-reset-all-accounts.ts

@@ -5,10 +5,10 @@ import { EntityType, retryFunction, shouldProcessEntity } from './util';
 
 const main = async (useConfig = false) => {
   if (process.argv[2]) useConfig = process.argv[2] === 'true';
-  await resetAllSpaces(useConfig);
+  await resetAllAccounts(useConfig);
 };
 
-export const resetAllSpaces = async (useConfig: boolean) => {
+export const resetAllAccounts = async (useConfig: boolean) => {
   const logger = createLogger();
   const config = createConfigUsingEnvVars();
 
@@ -30,7 +30,9 @@ export const resetAllSpaces = async (useConfig: boolean) => {
       logger.info(`[${count}] - processing space (${space.nameID})`);
 
       await retryFunction(
-        alkemioCliClient.authorizationResetSpace({ spaceID: space.id })
+        alkemioCliClient.authorizationResetAccount({
+          accountID: space.account.id,
+        })
       );
     }
   }

src/authorization-reset-all.ts

@@ -1,12 +1,12 @@
 import { resetAllUsers } from './authorization-reset-all-users';
-import { resetAllSpaces } from './authorization-reset-all-spaces';
+import { resetAllAccounts } from './authorization-reset-all-accounts';
 import { resetAllOrganizations } from './authorization-reset-all-organizations';
 import { resetPlatform } from './authorization-reset-platform';
 
 const main = async (useConfig = false) => {
   if (process.argv[2]) useConfig = process.argv[2] === 'true';
   await resetAllUsers(useConfig);
-  await resetAllSpaces(useConfig);
+  await resetAllAccounts(useConfig);
   await resetAllOrganizations(useConfig);
   await resetPlatform();
 };

src/client/AlkemioCliClient.ts

@@ -4,8 +4,8 @@ import {
   Sdk,
   getSdk,
   OrganizationAuthorizationResetInput,
-  SpaceAuthorizationResetInput,
   UserAuthorizationResetInput,
+  AccountAuthorizationResetInput,
 } from '../generated/graphql';
 import { Logger } from 'winston';
 import { AlkemioClient, AlkemioClientConfig } from '@alkemio/client-lib';
@@ -61,10 +61,10 @@ export class AlkemioCliClient {
     return result.data;
   }
 
-  public async authorizationResetSpace(
-    authorizationResetData: SpaceAuthorizationResetInput
+  public async authorizationResetAccount(
+    authorizationResetData: AccountAuthorizationResetInput
   ) {
-    const result = await this.sdkClient.authorizationPolicyResetOnSpace({
+    const result = await this.sdkClient.authorizationPolicyResetOnAccount({
       authorizationResetData: authorizationResetData,
     });
 

src/digital-twin-demo/digital-twin-demo.graphql

@@ -0,0 +1,30 @@
+query digitalTwinDemo(
+  $spaceNameID: UUID_NAMEID!
+){
+  space(ID:$spaceNameID) {
+    id
+    subspaces {
+      profile {
+        displayName
+        tagline
+      }
+      context {
+        vision
+        impact
+      }
+      collaboration {
+        callouts {
+          comments {
+            messagesCount
+          }
+          framing {
+            profile {
+              displayName
+              tagline
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/digital-twin-demo/digital-twin-demo.ts

@@ -0,0 +1,32 @@
+import { createConfigUsingEnvVars } from '../util/create-config-using-envvars';
+import { AlkemioCliClient } from '../client/AlkemioCliClient';
+import { createLogger } from '../util/create-logger';
+
+const main = async () => {
+  await digitalTwinDemo();
+};
+
+export const digitalTwinDemo = async () => {
+  const logger = createLogger();
+  const config = createConfigUsingEnvVars();
+
+  const alkemioCliClient = new AlkemioCliClient(config, logger);
+  await alkemioCliClient.initialise();
+  await alkemioCliClient.logUser();
+  await alkemioCliClient.validateConnection();
+
+  const spacesQueryResult = await alkemioCliClient.sdkClient.digitalTwinDemo({
+    spaceNameID: 'digileefomgeving',
+  });
+
+  const space = spacesQueryResult.data.space;
+
+  const subspaces = space.subspaces || [];
+
+  logger.info(`...total number of subspaces: ${subspaces.length}`);
+  logger.info(`...${JSON.stringify(space)}`);
+};
+
+main().catch(error => {
+  console.error(error);
+});

src/digital-twin-demo/model/spaceMetaInfo.ts

@@ -0,0 +1,10 @@
+export class SpaceMetaInfo {
+  Name = '';
+  ChallengesCount = 0;
+  MembersCount = 0;
+  HostOrgName = '';
+  HostOrgOwnerName = '';
+  Visibility = '';
+  FeatureFlagWhiteboard = false;
+  FeatureFlagCalloutTemplates = false;
+}