Merge branch 'main' into release/database-1.1.1

.version

@@ -1 +1 @@
-2.60.1
+2.60.2

frontend/.version

@@ -1 +1 @@
-2.60.1
+2.60.2

frontend/src/Editor/Components/Table/Datepicker.jsx

@@ -222,7 +222,7 @@ export const Datepicker = function Datepicker({
           handleDateChange(date);
         }}
         value={isDateInputFocussed ? dateInputValue : computeDateString(date)}
-        dateFormat={dateDisplayFormat}
+        dateFormat={!isDateSelectionEnabled && isTimeChecked ? 'HH:mm' : dateDisplayFormat}
         customInput={
           <TjDatepicker
             dateInputRef={dateInputRef}

frontend/src/Editor/Inspector/Inspector.jsx

@@ -455,17 +455,17 @@ export const Inspector = ({
         </div>
       </div>
       <span className="widget-documentation-link">
-        <a
-          href={`https://docs.tooljet.io/docs/widgets/${convertToKebabCase(componentMeta?.name ?? '')}`}
-          target="_blank"
-          rel="noreferrer"
-          data-cy="widget-documentation-link"
-        >
+        <a href={getDocsLink(componentMeta)} target="_blank" rel="noreferrer" data-cy="widget-documentation-link">
           <span>
             <Student width={13} fill={'#3E63DD'} />
             <small className="widget-documentation-link-text">
               {t('widget.common.documentation', 'Read documentation for {{componentMeta}}', {
-                componentMeta: componentMeta.name === 'ToggleSwitchLegacy' ? 'ToggleLegacy' : componentMeta.name,
+                componentMeta:
+                  componentMeta.displayName === 'Toggle Switch (Legacy)'
+                    ? 'Toggle (Legacy)'
+                    : componentMeta.displayName === 'Toggle Switch'
+                    ? 'Toggle Switch'
+                    : componentMeta.component,
               })}
             </small>
           </span>
@@ -477,6 +477,11 @@ export const Inspector = ({
     </div>
   );
 };
+const getDocsLink = (componentMeta) => {
+  return componentMeta.component == 'ToggleSwitchV2'
+    ? `https://docs.tooljet.io/docs/widgets/toggle-switch`
+    : `https://docs.tooljet.io/docs/widgets/${convertToKebabCase(componentMeta?.component ?? '')}`;
+};
 
 const widgetsWithStyleConditions = {
   Modal: {

server/.version

@@ -1 +1 @@
-2.60.1
+2.60.2