pollination-react-io 1.64.0 → 1.65.0

package/build/CreateStudy/CreateStudy.types.d.ts

@@ -1,4 +1,4 @@
-import type { Project, RecipeInterface, UserPrivate } from '@pollination-solutions/pollination-sdk';
+import type { Project, ProjectRecipeFilter, UserPrivate } from '@pollination-solutions/pollination-sdk';
 import { CSSProperties } from 'react';
 import { APIClient, ProjectJobInfo } from '../hooks';
 import { Account } from '../SelectAccount/SelectAccount.types';
@@ -6,7 +6,7 @@ export declare type CreateStudyProps = {
     style?: CSSProperties;
     defaultAccount?: Account;
     defaultProject?: Project;
-    defaultRecipe?: RecipeInterface;
+    defaultRecipe?: ProjectRecipeFilter;
     onSuccess?: (projectJobInfo: ProjectJobInfo, isCloud: boolean) => any;
     authUser?: UserPrivate;
     client?: APIClient;

package/build/SelectRecipe/SelectRecipe.types.d.ts

@@ -1,10 +1,10 @@
-import { RecipeInterface, UserPrivate } from '@pollination-solutions/pollination-sdk';
+import { ProjectRecipeFilter, UserPrivate } from '@pollination-solutions/pollination-sdk';
 import { APIClient } from '../hooks';
 export interface SelectRecipeProps {
     authUser?: UserPrivate;
     client?: APIClient;
     projectName?: string;
     projectOwner?: string;
-    value?: RecipeInterface;
-    onChange?: (recipe: RecipeInterface) => void;
+    value?: ProjectRecipeFilter;
+    onChange?: (recipe: ProjectRecipeFilter) => void;
 }

package/build/hooks/useCreateStudy.d.ts

@@ -1,5 +1,5 @@
 import { APIClient } from './useAPIClient';
-import { RecipeInterface } from '@pollination-solutions/pollination-sdk';
+import { ProjectRecipeFilter, RecipeInterface } from '@pollination-solutions/pollination-sdk';
 declare global {
     interface Window {
         sketchup?: any;
@@ -10,6 +10,7 @@ interface JobArgs {
     name: string;
     recipe: RecipeInterface;
     description?: string;
+    recipeFilter?: ProjectRecipeFilter;
 }
 export interface ProjectJobInfo {
     accountName: string;
@@ -18,6 +19,7 @@ export interface ProjectJobInfo {
     projectDescription?: string;
     jobName?: string;
     jobDescription?: string;
+    platform?: string;
 }
 export interface LocalConfig {
     localCPUCount: number;
@@ -29,6 +31,6 @@ export interface LocalConfig {
 export declare const useCreateStudy: (accountName: string, projectName: string, client: APIClient) => {
     host: string;
     createStudy: ({ name, recipe, description }: JobArgs, data: object, onSuccess?: (projectJobInfo: ProjectJobInfo) => void) => Promise<void>;
-    createLocalStudy: ({ name, description, recipe }: JobArgs, data: object, { localCPUCount, localRunFolder, isLocalJob, cloudProjectName, cloudProjectOwner }: LocalConfig, onSuccess?: (projectJobInfo: ProjectJobInfo) => void, key?: string) => Promise<any>;
+    createLocalStudy: ({ name, description, recipe, recipeFilter }: JobArgs, data: object, { localCPUCount, localRunFolder, isLocalJob, cloudProjectName, cloudProjectOwner }: LocalConfig, onSuccess?: (projectJobInfo: ProjectJobInfo) => void, key?: string) => Promise<any>;
 };
 export {};

package/build/hooks/usePollinationPanel.d.ts

@@ -13,4 +13,5 @@ export declare const usePollinationPanel: () => {
     getPaginatedJob: (projectSlug: string, pageSize: number, curPage: number) => ProjectJobInfo[];
     getJob: (projectSlug: string) => ProjectJobInfo[];
     deleteJob: (projectSlug: string, path: string) => any;
+    getPlatforms: (projectSlug: string) => {};
 };

package/build/index.esm.js

@@ -38120,6 +38120,26 @@ var usePollinationPanel = function () {
             return undefined;
         }
     };
+    /**
+     * Count number of simulation by platform
+     * @param projectSlug Project slug
+     * @returns Object with platform count
+     */
+    var getPlatforms = function (projectSlug) {
+        if (!panel)
+            return;
+        var count = {};
+        try {
+            var message = panel.GetJob(projectSlug);
+            var arr = JSON.parse(message.data);
+            arr.forEach(function (i) { count[i.platform] = (count[i.platform] || 0) + 1; });
+            return count;
+        }
+        catch (error) {
+            // Do nothing. It is written at the end
+            return undefined;
+        }
+    };
     /**
      * Delete job with the same input/ouput folder from DB
      * @param projectSlug Project slug
@@ -38150,7 +38170,8 @@ var usePollinationPanel = function () {
         fileExplorer: fileExplorer,
         getPaginatedJob: getPaginatedJob,
         getJob: getJob,
-        deleteJob: deleteJob
+        deleteJob: deleteJob,
+        getPlatforms: getPlatforms
     };
 };
 
@@ -38322,13 +38343,14 @@ var useCreateStudy = function (accountName, projectName, client) {
         });
     }, [accountName, client, processEntryCloud, projectName]);
     var createLocalStudy = useCallback(function (_a, data, _b, onSuccess, key) {
-        var name = _a.name, description = _a.description, recipe = _a.recipe;
+        var name = _a.name, description = _a.description, recipe = _a.recipe, recipeFilter = _a.recipeFilter;
         var localCPUCount = _b.localCPUCount, localRunFolder = _b.localRunFolder, isLocalJob = _b.isLocalJob, cloudProjectName = _b.cloudProjectName, cloudProjectOwner = _b.cloudProjectOwner;
         if (key === void 0) { key = performance.now().toString(); }
         return __awaiter$1(void 0, void 0, void 0, function () {
             var job, jobInfo, response;
-            return __generator$1(this, function (_c) {
-                switch (_c.label) {
+            var _c;
+            return __generator$1(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         if (!checkDotNet || !client || !uploadArtifact)
                             return [2 /*return*/];
@@ -38353,9 +38375,9 @@ var useCreateStudy = function (accountName, projectName, client) {
                             // JobInfo mapping
                         ];
                     case 1:
-                        job = _c.sent();
+                        job = _d.sent();
                         jobInfo = {
-                            RecipeOwner: '',
+                            RecipeOwner: (_c = recipeFilter.owner) !== null && _c !== void 0 ? _c : 'ladybug-tools',
                             Recipe: recipe,
                             Job: job,
                             IsLocalJob: isLocalJob,
@@ -41252,8 +41274,14 @@ var ComboFileSelector = function (_a) {
                     return (React__default.createElement(SelectCloudArtifacts, { projectOwner: projectOwner, projectName: projectName, value: value, hidden: hidden, fileNameMatch: typeof inputProps.accept === 'string' ?
                             ".*(".concat(inputProps.accept.replace(/\./g, '').split(', ').join('$|'), "$)") : '.*', onChange: onChange, client: client }));
                 case 'get_local':
-                    return (React__default.createElement(SelectLocalArtifactNative, { onChange: handleLocalArtifactSelect, buttonLabel: "Select ".concat(inputProps.accept.split(',').length > 1 ?
-                            'any of' : 'an', " ").concat(inputProps.accept, " ").concat(inputProps.accept.split(',').length > 1 ? 'file types' : 'file', "."), fileMatchPattern: "File types ".concat(inputProps.accept, "|*").concat(inputProps.accept.split(', ').join(';*')) }));
+                    return (React__default.createElement(SelectLocalArtifactNative, { onChange: handleLocalArtifactSelect, buttonLabel: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.accept)
+                            ? "Select ".concat(inputProps.accept.split(',').length > 1
+                                ? 'any of'
+                                : 'an', " ").concat(inputProps.accept, " ").concat(inputProps.accept.split(',').length > 1
+                                ? 'file types' : 'file', ".")
+                            : 'Select a file.', fileMatchPattern: (inputProps === null || inputProps === void 0 ? void 0 : inputProps.accept)
+                            ? "File types ".concat(inputProps.accept, "|*").concat(inputProps.accept.split(', ').join(';*'))
+                            : 'File types | *.*' }));
                 default:
                     return (React__default.createElement(FileInput, { onChange: onChange, inputProps: inputProps, accept: typeof inputProps.accept === 'string' ?
                             inputProps.accept.split(', ') : undefined }));
@@ -42395,7 +42423,7 @@ var SelectRecipe = function (_a) {
             var data;
             return __generator$1(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, client.projects.getProjectRecipes(queryConfig)];
+                    case 0: return [4 /*yield*/, client.projects.getProjectRecipeFilters(queryConfig)];
                     case 1:
                         data = (_a.sent()).data;
                         setRecipes(function (state) { return state ? __spreadArray(__spreadArray([], state, true), data.resources, true) : __spreadArray([], data.resources, true); });
@@ -42418,8 +42446,8 @@ var SelectRecipe = function (_a) {
             return;
         }
         // if (selRecipe == null) return
-        if (selRecipe && selRecipe.metadata && selRecipe.metadata.name) {
-            comboBoxRef.current.setInputValue(selRecipe.metadata.name);
+        if (selRecipe && selRecipe.name) {
+            comboBoxRef.current.setInputValue(selRecipe.name);
         }
         comboBoxRef.current.selectItem(selRecipe);
         valueRef.current = selRecipe;
@@ -42431,12 +42459,11 @@ var SelectRecipe = function (_a) {
             return;
         setPageNumber(projectApiRef.current.page + 1);
     }, []);
-    return (React__default.createElement(ComboBox, { ref: comboBoxRef, items: (_b = recipes === null || recipes === void 0 ? void 0 : recipes.map(function (r, i) { return (__assign(__assign({}, r), { name: "".concat(r.metadata.name, "-").concat(r.metadata.tag), id: "".concat(r.metadata.name, "-").concat(r.metadata.tag) })); })) !== null && _b !== void 0 ? _b : [], renderItem: function (item) { return (React__default.createElement("div", { style: {
+    return (React__default.createElement(ComboBox, { ref: comboBoxRef, items: (_b = recipes === null || recipes === void 0 ? void 0 : recipes.map(function (r, i) { return (__assign(__assign({}, r), { name: "".concat(r.name, "-").concat(r.tag), id: "".concat(r.name, "-").concat(r.tag) })); })) !== null && _b !== void 0 ? _b : [], onClear: function () { return setSelRecipe(undefined); }, renderItem: function (item) { return (React__default.createElement("div", { style: {
                 display: 'flex',
                 alignItems: 'center',
                 gap: 8,
-            }, id: "".concat(item.metadata.name, "-").concat(item.metadata.tag) },
-            React__default.createElement(Avatar, { src: item.metadata.icon, alt: item.metadata.name, fallback: item.metadata.name, size: 24 }), "".concat(item.metadata.name, "-").concat(item.metadata.tag))); }, setSelected: setSelRecipe, inputProps: {
+            }, id: "".concat(item.name, "-").concat(item.tag) }, item.name)); }, setSelected: setSelRecipe, inputProps: {
             placeholder: 'Select a recipe...',
         }, loading: loading, disabled: !authUser || !projectName, footer: (React__default.createElement("div", { key: "footer", style: {
                 width: '100%',
@@ -44759,15 +44786,15 @@ var RecipeForm = function (_a) {
                     : React__default.createElement(TextInput, { key: i.name, inputProps: __assign(__assign({}, register(i.name)), { defaultValue: i.default }), reset: function () { return handleReset(i); } });
             case InputType.DAGFileInput:
                 return React__default.createElement(Controller, { name: i.name, control: control, defaultValue: i.default, render: function (_a) {
-                        var _b, _c, _d;
-                        var _e = _a.field, value = _e.value, onChange = _e.onChange, field = __rest(_e, ["value", "onChange"]);
+                        var _b, _c;
+                        var _d = _a.field, value = _d.value, onChange = _d.onChange, field = __rest(_d, ["value", "onChange"]);
                         return React__default.createElement(ComboFileSelector, { projectOwner: projectOwner, projectName: projectName, defaultOption: i.extensions &&
                                 ((_b = i.extensions) === null || _b === void 0 ? void 0 : _b.includes('hbjson')) &&
                                 host !== 'web' ? 'get_model' : 'get_cloud', optionsConfig: {
-                                get_model: ((_c = i.extensions) === null || _c === void 0 ? void 0 : _c.includes('hbjson')) && host !== 'web',
+                                get_model: host !== 'web' && i.extensions && i.extensions.includes('hbjson'),
                                 get_local: host !== 'web',
                                 get_file: host === 'web'
-                            }, value: value, onChange: onChange, inputProps: __assign(__assign({}, field), { accept: i.extensions && ((_d = i.extensions) === null || _d === void 0 ? void 0 : _d.map(function (e) { return ".".concat(e); }).join(', ')) }), client: client });
+                            }, value: value, onChange: onChange, inputProps: __assign(__assign({}, field), { accept: i.extensions && ((_c = i.extensions) === null || _c === void 0 ? void 0 : _c.map(function (e) { return ".".concat(e); }).join(', ')) }), client: client });
                     } });
             // Others...
             default:
@@ -44852,11 +44879,38 @@ var CreateStudy = function (_a) {
     var _d = useState(0), activeTabIndex = _d[0], setActiveTabIndex = _d[1];
     var _e = useState(defaultAccount), selAccount = _e[0], setSelAccount = _e[1];
     var _f = useState(defaultProject), selProject = _f[0], setSelProject = _f[1];
-    var _g = useState(defaultRecipe), selRecipe = _g[0], setSelRecipe = _g[1];
+    var _g = useState(), selRecipe = _g[0], setSelRecipe = _g[1];
+    var _h = useState(defaultRecipe), selRecipeFilter = _h[0], setSelRecipeFilter = _h[1];
+    useEffect(function () {
+        if (!selRecipeFilter) {
+            setSelRecipe(undefined);
+            return;
+        }
+        // Remove tag from name
+        var clearName = selRecipeFilter
+            .name.replace(selRecipeFilter.tag, '')
+            .slice(0, -1);
+        // If * use latest
+        var conditionalTag = selRecipeFilter.tag === '*'
+            ? 'latest'
+            : selRecipeFilter.tag;
+        client.recipes.getRecipeByTag({
+            owner: selRecipeFilter.owner,
+            name: clearName,
+            tag: conditionalTag
+        })
+            .then(function (d) {
+            setSelRecipe(d.data.manifest);
+        }).catch(function (err) {
+            _t.error('Recipe not found. Try a new tag!', { duration: 2000, position: 'top-center', style: { minWidth: '300px', fontSize: '14px' }
+            });
+            setSelRecipe(undefined);
+        });
+    }, [selRecipeFilter]);
     // @ts-ignore
     var projectOwner = selAccount ? ((_b = selAccount.username) !== null && _b !== void 0 ? _b : selAccount.account_name) : undefined;
     var projectSlug = selProject ? selProject.slug.split('/')[1] : undefined;
-    var _h = useCreateStudy(projectOwner, projectSlug, client), host = _h.host, createStudy = _h.createStudy, createLocalStudy = _h.createLocalStudy;
+    var _j = useCreateStudy(projectOwner, projectSlug, client), host = _j.host, createStudy = _j.createStudy, createLocalStudy = _j.createLocalStudy;
     useEffect(function () {
         if (!selRecipe)
             return;
@@ -44874,7 +44928,7 @@ var CreateStudy = function (_a) {
             onSuccess(projectJobInfo, true);
         }
         else {
-            _t.success('Study submitted!', { duration: 4000, position: 'bottom-left', style: { minWidth: '300px', fontSize: '12px' }
+            _t.success('Study submitted!', { duration: 4000, position: 'bottom-left', style: { minWidth: '300px', fontSize: '14px' }
             });
             setTimeout(function () {
                 window.location.href = "".concat(basePath, "/").concat(projectJobInfo.accountName, "/projects/").concat(projectJobInfo.projectName, "/studies/").concat(projectJobInfo.studyId, "?tab=details&perPage=5&status=null&page=1");
@@ -44910,6 +44964,7 @@ var CreateStudy = function (_a) {
                 name: name,
                 recipe: selRecipe,
                 description: description !== null && description !== void 0 ? description : 'Study created from pollination',
+                recipeFilter: selRecipeFilter
             }, jobArgs, localConfig, localConfig.isLocalJob ? _onSuccessLocal : _onSuccessCloud);
         }
         else {
@@ -44948,7 +45003,8 @@ var CreateStudy = function (_a) {
                         React__default.createElement(SelectProject, { authUser: authUser, client: client, onChange: setSelProject, projectOwner: projectOwner, value: selProject })),
                     React__default.createElement(Label, { label: selRecipe && selRecipe.metadata ?
                             selRecipe.metadata.name : 'Recipe' },
-                        React__default.createElement(SelectRecipe, { authUser: authUser, client: client, projectOwner: projectOwner, projectName: selProject ? selProject.name : undefined, onChange: setSelRecipe, value: selRecipe })))),
+                        React__default.createElement(SelectRecipe, { authUser: authUser, client: client, projectOwner: projectOwner, projectName: selProject ? selProject.name : undefined, onChange: setSelRecipeFilter, value: selRecipeFilter }),
+                        React__default.createElement(Ie, null)))),
             selRecipe &&
                 React__default.createElement(React__default.Fragment, null,
                     React__default.createElement(TabPanel, { style: {