@pega/custom-dx-components 24.1.11 → 24.2.10

package/src/tasks/init/template/package.json.mustache

@@ -1,11 +1,12 @@
 {
   "name": "{{projectName}}",
-  "version": "{{version}}",
   "description": "{{description}}",
   "organization": "{{organization}}",
+  "version": "1.0.0",
   "main": "src/index.js",
   "type": "module",
   "scripts": {
+    "_***Component_and_Library_mode***": "Component and library mode commands",
     "startStorybook": "storybook dev --port 6040 --quiet",
     "lint": "eslint .",
     "authenticate": "custom-dx-components authenticate",
@@ -13,22 +14,49 @@
     "buildAllComponents": "custom-dx-components buildAllComponents",
     "create": "custom-dx-components create",
     "createAll": "custom-dx-components createAll",
-    "publish": "custom-dx-components publish",
-    "publishAll": "custom-dx-components publishAll",
     "rename": "custom-dx-components rename",
     "list": "custom-dx-components list",
     "validate-schema": "custom-dx-components validateSchema",
     "update": "custom-dx-components update",
     "delete": "custom-dx-components delete",
     "deleteAll": "custom-dx-components deleteAll",
+    "importComponent": "custom-dx-components importComponent",
+    "help": "custom-dx-components showHelp",
+    "publish": "custom-dx-components publish",
+    "_***Component_mode_only***": "Component only commands",
+    "publishAll": "custom-dx-components publishAll",
     "promoteWebPack": "custom-dx-components promoteWebPack",
     "revertWebPack": "custom-dx-components revertWebPack",
+    "_***Library_mode_only***": "Library mode only commands, Beta capability and subject to change.  Developer experimental.  Do not use in a Production Deployment",
+    "createLib": "custom-dx-components createLibrary",
+    "switchLib": "custom-dx-components switchLibrary",
+    "createLibVersion": "custom-dx-components createVersion",
+    "switchLibVersion": "custom-dx-components switchVersion",
+    "listLib": "custom-dx-components listLibrary",
+    "listPublishedLib": "custom-dx-components listPublished",
+    "deleteLib": "custom-dx-components deleteLibrary",
+    "deletePublishedLib": "custom-dx-components deletePublished",
+    "deleteLibVersion": "custom-dx-components deleteVersion",
+    "move": "custom-dx-components moveComponent",
+    "publishLibVersion": "custom-dx-components publish",
+    "storeLibVersion": "custom-dx-components storeComponents",
+    "showStatus": "custom-dx-components showStatus",
+    "setPermanent": "custom-dx-components setPermanent",
+    "importLibVersion": "custom-dx-components importArchive",
+    "exportLibVersion": "custom-dx-components exportArchive",
+    "validate": "custom-dx-components buildComponent",
+    "validateAll": "custom-dx-components buildAllComponents",
+    "_***Internal_only***": "Internal usage only",
     "_internal-test-coverage": "node --input-type=module  --experimental-vm-modules node_modules/jest/bin/jest.js --runInBand node_modules/@pega/custom-dx-component --ci --testResultsProcessor='jest-junit' --coverage",
     "_internal-test": "echo 'Running functional and unit tests will DELETE existing local components, proceed (y/n)?' && read proceed && if test \"$proceed\" = \"y\"; then npm run _internal-test-full; fi ",
     "_internal-test-full": "npm run _internal-test-functional && npm run _internal-test-unit",
-    "_internal-test-functional": "npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
+    "_internal-test-functional": "echo 'Make sure you authenticate!!' && npm run test:functional:local --prefix node_modules/@pega/custom-dx-components",
     "_internal-test-unit": "npm run test:unit:local --prefix node_modules/@pega/custom-dx-components",
     "_internal-build-jest-assets": "custom-dx-components buildJestAssets",
+    "_internal-buildLibrary": "custom-dx-components buildLibrary",
+    "_internal-publishLibrary": "custom-dx-components publishLibrary",
+    "_internal-restoreConfig": "custom-dx-components restoreConfig",
+    "_internal-test-quarantine": "custom-dx-components quarantine",
     "_lint:styles": "stylelint \"./**/*.@(js|jsx|ts|tsx)\"",
     "_lint:format": "prettier -c .",
     "_lint:spelling": "cspell --no-progress **/*",
@@ -49,58 +77,65 @@
   ],
   "author": "",
   "license": "Enter License",
-  "sideEffects": false,
- "dependencies": {
-    "@pega/cosmos-react-condition-builder": "^6.0.3",
-    "@pega/cosmos-react-core": "^6.0.3",
-    "@pega/cosmos-react-work": "^6.0.3",
-    "dayjs": "^1.11.10",
+  "dependencies": {
+    "@pega/cosmos-react-condition-builder": "~7.0.6",
+    "@pega/cosmos-react-core": "~7.0.6",
+    "@pega/cosmos-react-work": "~7.0.6",
+    "@pega/eslint-config": "^0.10.2",
+    "@pega/tsconfig": "^0.15.1",
+    "babel-loader": "^9.1.3",
+    "dayjs": "^1.11.11",
+    "fast-deep-equal": "3.1.3",
+    "lodash": "^4.17.21",
     "lodash.get": "^4.4.2",
-    "polished": "^4.2.2",
-    "prop-types": "^15.8.1",
+    "npm": "^10.8.1",
     "react": "^17.0.2",
     "react-autosuggest": "^10.1.0",
     "react-dom": "^17.0.2",
-    "react-is": "^17.0.2",
-    "react-player": "^2.10.1",
-    "react-redux": "^7.2.6",
-    "styled-components": "^5.3.5",
+    "react-is": "^18.3.1",
+    "react-redux": "^7.2.9",
+    "serve": "^14.2.3",
+    "shelljs": "^0.8.5",
+    "styled-components": "^5.3.11",
     "ts-loader": "^9.5.1"
   },
   "devDependencies": {
-    "@pega/configs": "^0.6.0",
-    "@pega/custom-dx-components": "24.1.11",
-    "@pega/pcore-pconnect-typedefs": "~3.0.0",
-    "@storybook/addon-actions": "^7.6.7",
-    "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-links": "^7.6.7",
-    "@storybook/addon-storysource": "^7.6.7",
-    "@storybook/react": "^7.6.7",
-    "@storybook/react-webpack5": "^7.6.7",
+    "@pega/configs": "^0.15.1",
+    "@pega/custom-dx-components": "~24.2.10",
+    "@pega/pcore-pconnect-typedefs": "3.2.1",
+    "@storybook/addon-actions": "^7.6.19",
+    "@storybook/addon-essentials": "^7.6.19",
+    "@storybook/addon-links": "^7.6.19",
+    "@storybook/addon-storysource": "^7.6.19",
+    "@storybook/react": "^7.6.19",
+    "@storybook/react-webpack5": "^7.6.19",
+    "@storybook/theming": "^7.6.19",
     "@types/emoji-mart": "^3.0.14",
     "@types/lodash.get": "^4.4.9",
-    "@types/react": "^17.0.39",
-    "@types/react-color": "^3.0.11",
-    "@types/react-dom": "^17.0.11",
+    "@types/react": "^17.0.80",
+    "@types/react-color": "^3.0.12",
+    "@types/react-dom": "^17.0.25",
     "@types/styled-components": "^5.1.34",
-    "@typescript-eslint/eslint-plugin": "^5.6.0",
-    "eslint": "^8.56.0",
-    "eslint-plugin-import": "^2.29.1",
-    "eslint-plugin-jest": "^27.6.1",
-    "eslint-plugin-jsx-a11y": "^6.8.0",
-    "eslint-plugin-mdx": "^2.3.2",
-    "eslint-plugin-prettier": "^5.1.2",
-    "eslint-plugin-react": "^7.33.2",
-    "eslint-plugin-react-hooks": "^4.6.0",
+    "@typescript-eslint/eslint-plugin": "^5.62.0",
+    "babel-loader": "^9.1.3",
+    "eslint": "^8.57.0",
+    "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest": "^28.8.3",
+    "eslint-plugin-jsx-a11y": "^6.10.0",
+    "eslint-plugin-mdx": "^3.1.5",
+    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-sonarjs": "^0.23.0",
     "eslint-plugin-storybook": "^0.6.15",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
+    "jwt-decode": "^4.0.0",
     "npm-run-all": "^4.1.5",
-    "prettier": "3.1.1",
-    "storybook": "^7.6.7",
-    "stylelint": "^14.11.0",
-    "typescript": "~4.9.5"
+    "prettier": "3.3.3",
+    "storybook": "^7.6.19",
+    "stylelint": "^16.10.0",
+    "typescript": "~5.3.3"
   }
 }

package/src/tasks/init/template/tasks.config.json

@@ -1,10 +1,12 @@
 {
   "components-directory-path": "src/components",
+  "import-relative-path": "Downloads",
+  "export-relative-path": "Downloads",
   "server-config": {
     "rulesetName": "CustomDXComponents",
     "rulesetVersion": "01-01-01",
     "sourceOfComponents": "Server",
-    "devBuild": false,
+    "devBuild": true,
     "serverType": "infinity",
     "server": "https://localhost:1080/prweb",
     "clientId": "10095186356008396159",
@@ -35,5 +37,7 @@
     "description": "",
     "icon": ""
   },
-  "usePromotedWebPack": false
+  "usePromotedWebPack": false,
+  "libraryMode": false,
+  "showDebug": false
 }

package/src/tasks/init/template/tsconfig.json

@@ -4,6 +4,11 @@
   "compilerOptions": {
     "noEmit": true,
     "allowJs": true,
-    "importsNotUsedAsValues": "remove"
+    "importsNotUsedAsValues": "remove",
+    "skipLibCheck": true,
+    "baseUrl": "./",
+    "paths": {
+      "@pega/pcore-pconnect-typedefs/*": ["node_modules/@pega/pcore-pconnect-typedefs/*"]
+    }
   }
 }

package/src/tasks/linter/index.js

@@ -1,7 +1,11 @@
 import { ESLint } from 'eslint';
 import chalk from 'chalk';
+// import { addDebugLog } from '../../util.js';
+
 
 export const lintComponent = async (dirToLint) => {
+// addDebugLog("lintComponent", `dirToLint: ${dirToLint}`);
+
   // console.log("in dx-component-builder-sdk: lintComponent - dirToLint: " + dirToLint);
   console.log(chalk.green(` linting ${dirToLint}`));
 

package/src/tasks/list/helper.js

@@ -3,12 +3,9 @@ import path from 'path';
 import chalk from 'chalk';
 import fetch from 'node-fetch';
 import { join } from 'path';
-import ora from 'ora';
-
-import inquirer from 'inquirer';
 
 import { LIST_COMPONENT_SERVICE_REST_ENDPOINT, LP_LIST_COMPONENT_SERVICE_REST_ENDPOINT, TOKEN_PATH, COMPONENT_SCHEMA, TASKS_CONFIG_JSON_FILENAME, COMPONENTS_DIRECTORY_PATH, COMPONENTS_PATH } from '../../constants.js';
-import { constructCompleteUrl, getComponents, getPegaServerConfig, getHttpsAgent, sanitize } from '../../util.js';
+import { constructCompleteUrl, getComponents, getPegaServerConfig, getHttpsAgent, addDebugLog, getLibraryBased, getComponentsConfigs, getConfigDefaults } from '../../util.js';
 
 export const SOURCE_OF_COMPONENT_TYPES = {
   SERVER: 'Server',
@@ -16,8 +13,8 @@ export const SOURCE_OF_COMPONENT_TYPES = {
 };
 
 
-
 export const getListComponentsQuestions = async (options) => {
+addDebugLog("getListComponentsQuestions", "", "");
   const defaultPegaServerConfig = await getPegaServerConfig();
 
   return [
@@ -35,6 +32,7 @@ export const getListComponentsQuestions = async (options) => {
 };
 
 export const getLaunchPadFilterQuestions = async () => {
+addDebugLog("getLaunchPadFilterQuestions", "", "");
   const defaultPegaServerConfig = await getPegaServerConfig();
   const currentDirectory = process.cwd();
   const pegaConfigJsonPath = join(currentDirectory, TASKS_CONFIG_JSON_FILENAME);
@@ -81,17 +79,44 @@ export const getLaunchPadFilterQuestions = async () => {
 }
 
 export const listLocalComponents = async (sourceOfComponents) => {
-  let localComponents = await getComponents();
-  localComponents = localComponents.map((name) => ({ 'Rule name': name }));
-  if (localComponents.length > 0) {
-    console.log(chalk.bold.blueBright(`List of custom components in ${sourceOfComponents}`));
-    console.table(localComponents, ['Rule name']);
-  } else {
-    console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
+addDebugLog("listLocalComponents", `sourceOfComponents: ${sourceOfComponents}`, "");
+
+  const isLibraryBased = getLibraryBased();
+  if (isLibraryBased) {
+    const defConfig = getConfigDefaults();
+    const data = await getComponentsConfigs();
+
+    // get built on from first component if exists
+    let builtOn = "(date unavailable)";
+    if (data[0] && data[0].buildDate) {
+      builtOn = data[0].buildDate;
+    }
+
+    if (data.length === 0) {
+      console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
+      process.exit();
+    }
+
+    let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
+    console.log(chalk.bold.blueBright(`\nList of ${defConfig.library}:${defConfig.buildVersion} components.`));
+    console.table(libData, ['Component', 'Label', 'Version', 'Type', 'Sub Type']);
+
   }
+  else {
+    let localComponents = await getComponents();
+    localComponents = localComponents.map((name) => ({ 'Rule name': name }));
+    if (localComponents.length > 0) {
+      console.log(chalk.bold.blueBright(`List of custom components in ${sourceOfComponents}`));
+      console.table(localComponents, ['Rule name']);
+    } else {
+      console.log(chalk.bold.redBright(`No custom components in ${sourceOfComponents}`));
+    }
+  }
+
 };
 
 async function fetchComponentsFromInfinity(apiUrl, headers) {
+addDebugLog("fetchComponentsFromInfinity", `apiUrl: ${apiUrl}`, "");
   const serverConfig = await getPegaServerConfig();
   return new Promise((resolve, reject) => {
     let status = 500;
@@ -102,7 +127,10 @@ async function fetchComponentsFromInfinity(apiUrl, headers) {
     })
       .then((response) => {
         status = response.status;
-        if (status === 404){
+        if (status === 401) {
+          throw new Error('Error occurred in authentication. Please regenerate using authenticate');
+        }
+        else if (status === 404){
           throw new Error('404: Server resource not found');
         }
         else if (status === 405){
@@ -131,7 +159,7 @@ async function fetchComponentsFromInfinity(apiUrl, headers) {
 }
 
 async function fetchComponentsFromLaunchpad(apiUrl, headers) {
-
+addDebugLog("fetchComponentsFromLaunchpad", `apiUrl: ${apiUrl}`, "");
   const serverConfig = await getPegaServerConfig();
   // constructing urls for all type of components
   const urls = COMPONENT_SCHEMA.type.map((type) => apiUrl.replace('{type}', type.value));
@@ -172,6 +200,7 @@ async function fetchComponentsFromLaunchpad(apiUrl, headers) {
 }
 
 export const getComponentsFromServer = async (library, organization) => {
+addDebugLog("getComponentsFromServer", `library: ${library}, organization: ${organization}`, "");
   const defaultPegaServerConfig = await getPegaServerConfig();
   const isLaunchpad = defaultPegaServerConfig.serverType === 'launchpad';
   const url = constructCompleteUrl(
@@ -220,6 +249,7 @@ export const getComponentsFromServer = async (library, organization) => {
 };
 
 export const displayServerComponents = async (data) => {
+addDebugLog("displayServerComponents", "", "");
   const defaultPegaServerConfig = await getPegaServerConfig();
   const isLaunchpad = defaultPegaServerConfig.serverType === 'launchpad';
   let list;
@@ -236,6 +266,9 @@ export const displayServerComponents = async (data) => {
       /* empty */
     }
   }
+
+
+
   /**
    * TODO: Need to modify the components list mapping code to support Launchpad components
    */

package/src/tasks/list/index.js

@@ -2,7 +2,7 @@ import inquirer from 'inquirer';
 import ora from 'ora';
 import chalk from 'chalk';
 
-import { showVersion, getPegaServerConfig } from '../../util.js';
+import { showVersion, getPegaServerConfig, getLibraryBased, addDebugLog, checkLibraryAndArchives } from '../../util.js';
 
 import {
   listLocalComponents,
@@ -13,7 +13,9 @@ import {
   getListComponentsQuestions
 } from './helper.js';
 
+
 const getList = async (sourceOfComponents, answers) => {
+addDebugLog("getList", `sourceOfComponents: ${sourceOfComponents}`, "");
   const defaultPegaServerConfig = await getPegaServerConfig();
   const isLaunchpad = defaultPegaServerConfig.serverType === 'launchpad';
 
@@ -34,7 +36,6 @@ const getList = async (sourceOfComponents, answers) => {
         ({library, organization} = lpAnswers);
       }
 
-
       const spinner = ora('Fetching components from server\n').start();
 
       try {
@@ -55,7 +56,6 @@ const getList = async (sourceOfComponents, answers) => {
         process.exit(1);
       }
 
-
       break;
     }
     default: {
@@ -66,11 +66,19 @@ const getList = async (sourceOfComponents, answers) => {
 };
 
 export default async (options) => {
-  showVersion();
+  await showVersion();
+  await checkLibraryAndArchives();
+  const isLibraryBased = getLibraryBased();
 
-  let sourceOfComponentsOption = SOURCE_OF_COMPONENT_TYPES.LOCAL;
 
-  if (options.params[3] === SOURCE_OF_COMPONENT_TYPES.LOCAL) {
+addDebugLog("list", "", "+");
+
+  let sourceOfComponentsOption = SOURCE_OF_COMPONENT_TYPES.LOCAL;
+  if (isLibraryBased) {
+    sourceOfComponentsOption = SOURCE_OF_COMPONENT_TYPES.LOCAL;
+    await getList(sourceOfComponentsOption);
+  }
+  else if (options.params[3] === SOURCE_OF_COMPONENT_TYPES.LOCAL) {
     sourceOfComponentsOption = options.params[3];
     await getList(sourceOfComponentsOption);
   } else if (options.params[3] === SOURCE_OF_COMPONENT_TYPES.SERVER) {
@@ -84,4 +92,5 @@ export default async (options) => {
     const { sourceOfComponents } = answers;
     await getList(sourceOfComponents, answers);
   }
+addDebugLog("list", "END", "-");
 };

package/src/tasks/list-lib/helper.js

@@ -0,0 +1,43 @@
+import chalk from 'chalk';
+
+import {
+  addDebugLog,
+  getConfigDefaults,
+  getLibraryArchiveDirectories
+} from '../../util.js';
+
+
+export const SOURCE_OF_COMPONENT_TYPES = {
+  SERVER: 'Server',
+  LOCAL: 'Local'
+};
+
+
+export const getArchiveLibraryQuestions = async () => {
+  addDebugLog("getDeleteLibraryQuestions", "", "");
+    const configDef = getConfigDefaults();
+    const archLibs = await getLibraryArchiveDirectories("");
+
+    return [
+      {
+        name: 'libraryName',
+        type: 'rawlist',
+        message: 'Select library',
+        choices: archLibs
+      }
+    ];
+  };
+
+
+export const getLibraryVersionQuestion = async(libraryName, libVersions) => {
+addDebugLog("getLibraryVersionQuestion", `libraryName: ${libraryName}, libVersions: ${libVersions}`, "");
+    return [
+      {
+        name: 'version',
+        type: 'rawlist',
+        message: `Select ${chalk.green.bold(`${libraryName}`)} library version`,
+        choices: libVersions
+      }
+    ];
+
+}

package/src/tasks/list-lib/index.js

@@ -0,0 +1,148 @@
+import inquirer from 'inquirer';
+import chalk from 'chalk';
+
+import {showVersion, getLibraryBased, addDebugLog, checkLibraryAndArchives, getLibraryArchivesVersions, getConfigDefaults, getLocalArchivedLibrraryVersionData, getComponentsConfigs, cleanUpTemp } from '../../util.js';
+import { getArchiveLibraryQuestions } from './helper.js';
+
+export default async (options) => {
+  const isLibraryBased =  getLibraryBased();
+
+  if (!isLibraryBased) {
+    console.log(`Command only supported for ${chalk.bold.green('library mode')} components.`)
+    process.exit();
+  }
+
+  await showVersion();
+  await checkLibraryAndArchives();
+addDebugLog("listLibrary", "", "+");
+
+  await cleanUpTemp();
+
+  let organization;
+  let library;
+
+  const compDef = getConfigDefaults();
+  organization = compDef.organization;
+  library = compDef.library;
+  let libraryName;
+  const currnetVersion = compDef.buildVersion;
+  let selectedVersion;
+  let libVersions = [];
+  let currentOrStore = "";
+
+  if (options.params.length >= 5) {
+    libraryName = options.params[3];
+    selectedVersion = options.params[4];
+    if (options.params.length >= 6) {
+      currentOrStore = options.params[5];
+    }
+
+
+    try {
+      libVersions = await getLibraryArchivesVersions(libraryName, "");
+    }
+    catch (ex) {}
+
+  }
+  else {
+
+    const questions = await getArchiveLibraryQuestions();
+    const answers = await inquirer.prompt(questions);
+    ({ libraryName } = answers);
+
+    try {
+      libVersions = await getLibraryArchivesVersions(libraryName, "");
+    }
+    catch (ex) {}
+
+
+    if (libVersions.length > 0) {
+
+      if (selectedVersion === undefined) {
+        const libAnswers = await inquirer.prompt([
+
+          {
+            name: 'libVersion',
+            type: 'rawlist',
+            message: 'Enter version',
+            choices: libVersions
+          },
+        ]);
+
+        selectedVersion = libAnswers.libVersion;
+      }
+    }
+  }
+
+  let data;
+  // get built on from first component if exists
+  let builtOn = "(date unavailable)";
+
+  if (libVersions.length > 0) {
+
+      if (libraryName === compDef.currentOrgLib && selectedVersion === compDef.buildVersion) {
+
+        console.log("\nYou've selected the current working library/version.");
+        console.log("You can list current components or the last store of this library/version.");
+
+        if (currentOrStore === "") {
+          const archAnswers = await inquirer.prompt([
+            {
+              name: 'currentOrStore',
+              type: 'rawlist',
+              message: 'Select current or store',
+              default: "Current",
+              choices: ["Current", "Store"]
+            },
+          ]);
+
+          currentOrStore = archAnswers.currentOrStore;
+        }
+
+
+        if (currentOrStore === "Current") {
+          data = await getComponentsConfigs();
+          builtOn = "(no date - current)";
+        }
+        else {
+          data = await getLocalArchivedLibrraryVersionData(libraryName, selectedVersion);
+          data = JSON.parse(data);
+
+          if (data[0] && data[0].buildDate) {
+            builtOn = data[0].buildDate;
+          }
+        }
+
+      }
+      else {
+        data = await getLocalArchivedLibrraryVersionData(libraryName, selectedVersion);
+        data = JSON.parse(data);
+
+        if (data[0] && data[0].buildDate) {
+          builtOn = data[0].buildDate;
+        }
+      }
+
+      if (data.length === 0) {
+        console.log(chalk.bold.redBright(`No custom components in ${libraryName}/${selectedVersion}`));
+        process.exit();
+      }
+
+      let libData = data.map((component) => ( {'Component': component.name, 'Label': component.label, 'Version': component.version, 'Type': component.type, 'Sub Type' : component.subtype}));
+      console.log(chalk.bold.blueBright(`\nList of ${libraryName}:${selectedVersion} components built on ${builtOn}.`));
+      console.table(libData, ['Component', 'Label', 'Version', 'Type', 'Sub Type']);
+
+  }
+  else {
+    // No library with that name
+    console.log(chalk.redBright(`No other library versions for ${libraryName} exist other than current library version.`));
+    console.log(chalk.redBright(`To see contents for the currnet library version, enter 'npm run list'.`));
+addDebugLog("listLibrary", "END", "-");
+    process.exit();
+  }
+
+
+addDebugLog("listLibrary", "END", "-");
+
+  return true;
+};